From 033692d7ee6cf014f252a033bd302b4e35c2f4fc Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Fri, 15 Mar 2013 08:26:49 +0400
Subject: [PATCH] had some strange issues with unit tests, added error checks.

---
 .../TestHelpers/BaseDatabaseFactoryTest.cs           | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
index 34767c8e48..99a92ee10b 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
@@ -101,9 +101,15 @@ namespace Umbraco.Tests.TestHelpers
         [TearDown]
         public virtual void TearDown()
         {
-			DatabaseContext.Database.Dispose();
-			//reset the app context            
-			ApplicationContext.ApplicationCache.ClearAllCache();
+            if (ApplicationContext != null)
+            {
+                if (DatabaseContext != null && DatabaseContext.Database != null)
+                {
+                    DatabaseContext.Database.Dispose();        
+                }
+                //reset the app context            
+                ApplicationContext.ApplicationCache.ClearAllCache();    
+            }
 
             SqlSyntaxContext.SqlSyntaxProvider = null;