diff --git a/umbraco.MacroEngines.Juno/App.Config b/umbraco.MacroEngines.Juno/App.Config
index 320fba12ed..b62d8af891 100644
--- a/umbraco.MacroEngines.Juno/App.Config
+++ b/umbraco.MacroEngines.Juno/App.Config
@@ -10,7 +10,7 @@
 
   <system.web.webPages.razor>
     <host factoryType="umbraco.MacroEngines.RazorUmbracoFactory, umbraco.MacroEngines"/>
-    <pages pageBaseType="System.Web.WebPages.WebPage, System.Web.WebPages">
+    <pages pageBaseType="umbraco.MacroEngines.DynamicNodeContext">
       <namespaces>
         <add namespace="Microsoft.Web.Helpers" />
       </namespaces>
diff --git a/umbraco.MacroEngines.Juno/RazorMacroEngine.cs b/umbraco.MacroEngines.Juno/RazorMacroEngine.cs
index 92a74de859..6fc9c80988 100644
--- a/umbraco.MacroEngines.Juno/RazorMacroEngine.cs
+++ b/umbraco.MacroEngines.Juno/RazorMacroEngine.cs
@@ -117,7 +117,7 @@ namespace umbraco.MacroEngines
             if (razorSyntax == null)
                 throw new ArgumentNullException("razorSyntax");
             if (scriptLanguage == null)
-                throw new AbandonedMutexException("scriptLanguage");
+                throw new ArgumentNullException("scriptLanguage");
 
             //Get Rid Of Whitespace From Start/End
             razorSyntax = razorSyntax.Trim();