diff --git a/module/VuFind/src/VuFind/Connection/Manager.php b/module/VuFind/src/VuFind/Connection/Manager.php
index 9f2493ee4fa784f616503b88f537420a702c8d00..f6db71da77115289e35aead24ba1024d09103480 100644
--- a/module/VuFind/src/VuFind/Connection/Manager.php
+++ b/module/VuFind/src/VuFind/Connection/Manager.php
@@ -95,10 +95,12 @@ class Manager
         // Set the service locator:
         $index->setServiceLocator(self::$serviceLocator);
 
-        // Set the logger:
-        \VuFind\ServiceManager\Initializer::initInstance(
-            $index, self::$serviceLocator
-        );
+        // Inject dependencies with the standard initializer:
+        if (null !== self::$serviceLocator) {
+            \VuFind\ServiceManager\Initializer::initInstance(
+                $index, self::$serviceLocator
+            );
+        }
 
         return $index;
     }
diff --git a/module/VuFind/src/VuFind/ServiceManager/Initializer.php b/module/VuFind/src/VuFind/ServiceManager/Initializer.php
index cb2cbdbb3a45b4febcfcde4c2e7871cba0b53d85..d16d26fc0e5704524adaef9e867f63635da4970c 100644
--- a/module/VuFind/src/VuFind/ServiceManager/Initializer.php
+++ b/module/VuFind/src/VuFind/ServiceManager/Initializer.php
@@ -68,7 +68,10 @@ class Initializer
      */
     public static function initPlugin($instance, AbstractPluginManager $manager)
     {
-        static::initInstance($instance, $manager->getServiceLocator());
+        $sm = $manager->getServiceLocator();
+        if (null !== $sm) {
+            static::initInstance($instance, $sm);
+        }
         if (method_exists($instance, 'setPluginManager')) {
             $instance->setPluginManager($manager);
         }