diff --git a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs
index 8f177c46a8..eb7db579a6 100644
--- a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs
+++ b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs
@@ -51,7 +51,9 @@ namespace umbraco.MacroEngines
             if (int.TryParse(NodeId, out DynamicBackingItemId))
             {
                 this.n = new DynamicBackingItem(DynamicBackingItemId);
+                return;
             }
+            throw new ArgumentException("Cannot instantiate a DynamicNode without an id");
         }
         public DynamicNode(object NodeId)
         {
@@ -59,7 +61,9 @@ namespace umbraco.MacroEngines
             if (int.TryParse(string.Format("{0}", NodeId), out DynamicBackingItemId))
             {
                 this.n = new DynamicBackingItem(DynamicBackingItemId);
+                return;
             }
+            throw new ArgumentException("Cannot instantiate a DynamicNode without an id");
         }
         public DynamicNode()
         {
diff --git a/umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs b/umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs
index c6ebc35619..a0cf3b3a2e 100644
--- a/umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs
+++ b/umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs
@@ -60,6 +60,7 @@ namespace umbraco.MacroEngines.Library
             {
                 return MediaById(mediaId);
             }
+            throw new ArgumentException("Cannot get MediaById without an id");
             return null;
         }
         public DynamicNode MediaById(object Id)