diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index 7ffcb44c4d..b95c29c368 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -751,7 +751,8 @@ namespace Umbraco.Core.Services
                     Save(content, userId);
                 }
 
-                Moved(content, e);
+                if(Moved != null)
+                    Moved(content, e);
             }
         }
 
@@ -802,7 +803,8 @@ namespace Umbraco.Core.Services
                 _unitOfWork.Commit();
             }
 
-            Copied(copy, e);
+            if(Copied != null)
+                Copied(copy, e);
 
             return copy;
         }
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 4d41b9ba7f..31b7a398b0 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -117,7 +117,9 @@ namespace Umbraco.Tests.Services
                                                 });
 
             // Act
-            var content = ServiceContext.ContentService.CreateContent(-1, "umbTextpage");
+            var contentService = ServiceContext.ContentService as ContentService;
+            contentService.SetHttpContext(null);
+            var content = contentService.CreateContent(-1, "umbTextpage");
 
             // Assert
             Assert.That(content, Is.Not.Null);
@@ -687,6 +689,8 @@ namespace Umbraco.Tests.Services
         public override void TearDown()
         {
             base.TearDown();
+
+            ServiceContext = null;
         }
 
         public void CreateTestData()
diff --git a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
index 5184230ab2..729cfac44c 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
@@ -59,6 +59,7 @@ namespace Umbraco.Tests.TestHelpers
             Resolution.Freeze();
             ApplicationContext = new ApplicationContext() { IsReady = true };
             DatabaseContext = DatabaseContext.Current;
+            ServiceContext = ServiceContext.Current;
 
             //Configure the Database and Sql Syntax based on connection string set in config
             DatabaseContext.Initialize();
@@ -72,6 +73,7 @@ namespace Umbraco.Tests.TestHelpers
             //reset the app context
             DatabaseContext = null;
             ApplicationContext.Current = null;
+            ServiceContext = null;
             Resolution.IsFrozen = false;
 
             string path = TestHelper.CurrentAssemblyDirectory;
@@ -86,10 +88,7 @@ namespace Umbraco.Tests.TestHelpers
 
         protected ApplicationContext ApplicationContext { get; set; }
 
-        protected ServiceContext ServiceContext
-        {
-            get { return ServiceContext.Current; }
-        }
+        protected ServiceContext ServiceContext { get; set; }
 
         protected DatabaseContext DatabaseContext { get; set; }