diff --git a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
index bf06a66f2b..5228889791 100644
--- a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
+++ b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
@@ -68,7 +68,7 @@ namespace Umbraco.Core.Persistence
 						//double check
                         if (_nonHttpInstance == null)
 						{
-                            _nonHttpInstance = string.IsNullOrEmpty(_providerName) == false && string.IsNullOrEmpty(_providerName) == false
+                            _nonHttpInstance = string.IsNullOrEmpty(_connectionString) == false && string.IsNullOrEmpty(_providerName) == false
 						                          ? new UmbracoDatabase(_connectionString, _providerName)
 						                          : new UmbracoDatabase(_connectionStringName);
 						}
@@ -81,7 +81,7 @@ namespace Umbraco.Core.Persistence
 			if (HttpContext.Current.Items.Contains(typeof(DefaultDatabaseFactory)) == false)
 			{
 				HttpContext.Current.Items.Add(typeof (DefaultDatabaseFactory),
-                                              string.IsNullOrEmpty(_providerName) == false && string.IsNullOrEmpty(_providerName) == false
+                                              string.IsNullOrEmpty(_connectionString) == false && string.IsNullOrEmpty(_providerName) == false
 					                              ? new UmbracoDatabase(_connectionString, _providerName)
 					                              : new UmbracoDatabase(_connectionStringName));
 			}
diff --git a/src/Umbraco.Tests/TypeFinderTests.cs b/src/Umbraco.Tests/TypeFinderTests.cs
index 85b8bc9c9d..7d052d7cbc 100644
--- a/src/Umbraco.Tests/TypeFinderTests.cs
+++ b/src/Umbraco.Tests/TypeFinderTests.cs
@@ -85,8 +85,8 @@ namespace Umbraco.Tests
             var originalTypesFound = TypeFinderOriginal.FindClassesOfType<IApplicationStartupHandler>(_assemblies);
 
             Assert.AreEqual(originalTypesFound.Count(), typesFound.Count());
-            Assert.AreEqual(4, typesFound.Count());
-            Assert.AreEqual(4, originalTypesFound.Count());
+            Assert.AreEqual(6, typesFound.Count());
+            Assert.AreEqual(6, originalTypesFound.Count());
         }
 
         [Test]