diff --git a/src/Orchard.Tests.Modules/DatabaseEnabledTestsBase.cs b/src/Orchard.Tests.Modules/DatabaseEnabledTestsBase.cs
index 94f164e69..ad264956d 100644
--- a/src/Orchard.Tests.Modules/DatabaseEnabledTestsBase.cs
+++ b/src/Orchard.Tests.Modules/DatabaseEnabledTestsBase.cs
@@ -48,8 +48,11 @@ namespace Orchard.Tests.Modules {
 
         [TearDown]
         public void Cleanup() {
-            _container.Dispose();
-            _session.Close();
+            if(_container != null)
+                _container.Dispose();
+
+            if(_session != null)
+                _session.Close();
         }
 
         public abstract void Register(ContainerBuilder builder);
diff --git a/src/Orchard.Web/Themes/Properties/AssemblyInfo.cs b/src/Orchard.Web/Themes/Properties/AssemblyInfo.cs
index f7fa5104c..fcc65c8d0 100644
--- a/src/Orchard.Web/Themes/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Themes/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly: AssemblyTitle("Orchard.Themes")]
+[assembly: AssemblyTitle("Themes")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
diff --git a/src/Orchard.Web/Themes/Orchard.Themes.csproj b/src/Orchard.Web/Themes/Themes.csproj
similarity index 97%
rename from src/Orchard.Web/Themes/Orchard.Themes.csproj
rename to src/Orchard.Web/Themes/Themes.csproj
index dce142784..011a01a77 100644
--- a/src/Orchard.Web/Themes/Orchard.Themes.csproj
+++ b/src/Orchard.Web/Themes/Themes.csproj
@@ -9,8 +9,8 @@
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Orchard.Themes</RootNamespace>
-    <AssemblyName>Orchard.Themes</AssemblyName>
+    <RootNamespace>Themes</RootNamespace>
+    <AssemblyName>Themes</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <FileUpgradeFlags>
diff --git a/src/Orchard.sln b/src/Orchard.sln
index 7f33dc2ef..fd5fc90c9 100644
--- a/src/Orchard.sln
+++ b/src/Orchard.sln
@@ -88,7 +88,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Migrations", "Orcha
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Themes", "Themes", "{74492CBC-7201-417E-BC29-28B4C25A58B0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Themes", "Orchard.Web\Themes\Orchard.Themes.csproj", "{CB70A642-8CEC-4DDE-8C9F-AD08900EC98D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Themes", "Orchard.Web\Themes\Themes.csproj", "{CB70A642-8CEC-4DDE-8C9F-AD08900EC98D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution