diff --git a/Modules.EDMIAPI/DatabaseWithFallback.vb b/Modules.EDMIAPI/DatabaseWithFallback.vb
index cb93bced..de9053a9 100644
--- a/Modules.EDMIAPI/DatabaseWithFallback.vb
+++ b/Modules.EDMIAPI/DatabaseWithFallback.vb
@@ -53,8 +53,12 @@ Public Class DatabaseWithFallback
         _DatabaseECM = DatabaseECM
         _DatabaseIDB = DatabaseIDB
 
+        _Logger.Debug("Client exists: [{0}]", Not IsNothing(Client))
+        _Logger.Debug("DatabaseECM exists: [{0}]", Not IsNothing(DatabaseECM))
+        _Logger.Debug("DatabaseIDB exists: [{0}]", Not IsNothing(DatabaseIDB))
+
         ' Load client config, will throw if client is not yet connected to service
-        _ClientConfig = Client.ClientConfig
+        _ClientConfig = Client?.ClientConfig
     End Sub
 
     ''' <summary>