@@ -105,7 +105,7 @@ abstract class AbstractBaseModule implements
      *
      * @since [*next-version*]
      *
-     * @var ContainerFactoryInterface
+     * @var ContainerFactoryInterface|null
      */
     protected $containerFactory;
 
@@ -114,12 +114,12 @@ abstract class AbstractBaseModule implements
      *
      * @since [*next-version*]
      *
-     * @param ContainerFactoryInterface                     $containerFactory The container factory.
+     * @param ContainerFactoryInterface|null                $containerFactory The container factory, or null.
      * @param string|Stringable                             $key              The module key.
      * @param string[]|Stringable[]                         $dependencies     The module dependencies.
      * @param array|ArrayAccess|stdClass|ContainerInterface $config           The module config.
      */
-    protected function _initModule(ContainerFactoryInterface $containerFactory, $key, $dependencies = array(), $config = array())
+    protected function _initModule($containerFactory, $key, $dependencies = array(), $config = array())
     {
         $this->_setKey($key);
         $this->_setDependencies($dependencies);
@@ -132,7 +132,7 @@ protected function _initModule(ContainerFactoryInterface $containerFactory, $key
      *
      * @since [*next-version*]
      *
-     * @return ContainerFactoryInterface The container factory instance.
+     * @return ContainerFactoryInterface|null The container factory instance, if any.
      */
     protected function _getContainerFactory()
     {
@@ -144,10 +144,19 @@ protected function _getContainerFactory()
      *
      * @since [*next-version*]
      *
-     * @param ContainerFactoryInterface $containerFactory The container factory instance.
+     * @param ContainerFactoryInterface|null $containerFactory The container factory instance or null.
      */
-    protected function _setContainerFactory(ContainerFactoryInterface $containerFactory)
+    protected function _setContainerFactory($containerFactory)
     {
+        if ($containerFactory !== null && !($containerFactory instanceof ContainerFactoryInterface)) {
+            throw $this->_createInvalidArgumentException(
+                $this->__('Argument is not a container factory'),
+                null,
+                null,
+                $containerFactory
+            );
+        }
+
         $this->containerFactory = $containerFactory;
     }
 
@@ -163,10 +172,21 @@ protected function _setContainerFactory(ContainerFactoryInterface $containerFact
      *
      * @throws CouldNotMakeExceptionInterface If the factory failed to create the exception.
      * @throws FactoryExceptionInterface      If the factory encountered an error.
+     * @throws RuntimeException               If the container factory associated with this instance is null.
      */
     protected function _createContainer($definitions = array(), ContainerInterface $parent = null)
     {
-        return $this->_getContainerFactory()->make(['definitions' => $definitions, 'parent' => $parent]);
+        $containerFactory = $this->_getContainerFactory();
+
+        if (!($containerFactory instanceof ContainerFactoryInterface)) {
+            throw $this->_createRuntimeException(
+                $this->__('Not a valid container factory instance'),
+                null,
+                null
+            );
+        }
+
+        return $containerFactory->make(['definitions' => $definitions, 'parent' => $parent]);
     }
 
     /**
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ abstract class AbstractBaseModule implements`
`105`	`105`	`*`
`106`	`106`	`* @since [next-version]`
`107`	`107`	`*`
`108`		`- * @var ContainerFactoryInterface`
	`108`	`+ * @var ContainerFactoryInterface\|null`
`109`	`109`	`*/`
`110`	`110`	`protected $containerFactory;`
`111`	`111`
`@@ -114,12 +114,12 @@ abstract class AbstractBaseModule implements`
`114`	`114`	`*`
`115`	`115`	`* @since [next-version]`
`116`	`116`	`*`
`117`		`- * @param ContainerFactoryInterface $containerFactory The container factory.`
	`117`	`+ * @param ContainerFactoryInterface\|null $containerFactory The container factory, or null.`
`118`	`118`	`* @param string\|Stringable $key The module key.`
`119`	`119`	`* @param string[]\|Stringable[] $dependencies The module dependencies.`
`120`	`120`	`* @param array\|ArrayAccess\|stdClass\|ContainerInterface $config The module config.`
`121`	`121`	`*/`
`122`		`- protected function _initModule(ContainerFactoryInterface $containerFactory, $key, $dependencies = array(), $config = array())`
	`122`	`+ protected function _initModule($containerFactory, $key, $dependencies = array(), $config = array())`
`123`	`123`	`{`
`124`	`124`	`$this->_setKey($key);`
`125`	`125`	`$this->_setDependencies($dependencies);`
`@@ -132,7 +132,7 @@ protected function _initModule(ContainerFactoryInterface $containerFactory, $key`
`132`	`132`	`*`
`133`	`133`	`* @since [next-version]`
`134`	`134`	`*`
`135`		`- * @return ContainerFactoryInterface The container factory instance.`
	`135`	`+ * @return ContainerFactoryInterface\|null The container factory instance, if any.`
`136`	`136`	`*/`
`137`	`137`	`protected function _getContainerFactory()`
`138`	`138`	`{`
`@@ -144,10 +144,19 @@ protected function _getContainerFactory()`
`144`	`144`	`*`
`145`	`145`	`* @since [next-version]`
`146`	`146`	`*`
`147`		`- * @param ContainerFactoryInterface $containerFactory The container factory instance.`
	`147`	`+ * @param ContainerFactoryInterface\|null $containerFactory The container factory instance or null.`
`148`	`148`	`*/`
`149`		`- protected function _setContainerFactory(ContainerFactoryInterface $containerFactory)`
	`149`	`+ protected function _setContainerFactory($containerFactory)`
`150`	`150`	`{`
	`151`	`+ if ($containerFactory !== null && !($containerFactory instanceof ContainerFactoryInterface)) {`
	`152`	`+ throw $this->_createInvalidArgumentException(`
	`153`	`+ $this->__('Argument is not a container factory'),`
	`154`	`+ null,`
	`155`	`+ null,`
	`156`	`+ $containerFactory`
	`157`	`+ );`
	`158`	`+ }`
	`159`	`+`
`151`	`160`	`$this->containerFactory = $containerFactory;`
`152`	`161`	`}`
`153`	`162`
`@@ -163,10 +172,21 @@ protected function _setContainerFactory(ContainerFactoryInterface $containerFact`
`163`	`172`	`*`
`164`	`173`	`* @throws CouldNotMakeExceptionInterface If the factory failed to create the exception.`
`165`	`174`	`* @throws FactoryExceptionInterface If the factory encountered an error.`
	`175`	`+ * @throws RuntimeException If the container factory associated with this instance is null.`
`166`	`176`	`*/`
`167`	`177`	`protected function _createContainer($definitions = array(), ContainerInterface $parent = null)`
`168`	`178`	`{`
`169`		`- return $this->_getContainerFactory()->make(['definitions' => $definitions, 'parent' => $parent]);`
	`179`	`+ $containerFactory = $this->_getContainerFactory();`
	`180`	`+`
	`181`	`+ if (!($containerFactory instanceof ContainerFactoryInterface)) {`
	`182`	`+ throw $this->_createRuntimeException(`
	`183`	`+ $this->__('Not a valid container factory instance'),`
	`184`	`+ null,`
	`185`	`+ null`
	`186`	`+ );`
	`187`	`+ }`
	`188`	`+`
	`189`	`+ return $containerFactory->make(['definitions' => $definitions, 'parent' => $parent]);`
`170`	`190`	`}`
`171`	`191`
`172`	`192`	`/**`