From 1f6cc18ba49fd0ff53802bb62683565a9f2c34e0 Mon Sep 17 00:00:00 2001
From: "agrath@gmail.com" <unknown@kiln.example.com>
Date: Sun, 12 Jun 2011 12:17:00 -0200
Subject: [PATCH] Clarified exceptions when using NodeById and MediaById and
 passing empty strings, e.g. if your source came from @Parameter

---
 umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs     | 4 ++++
 .../RazorDynamicNode/RazorLibraryCore.cs                      | 1 +
 2 files changed, 5 insertions(+)

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)