Better error message for invalid dObjects

DenizenScript · Oct 21, 2013 · 7572f06 · 7572f06
1 parent 778e6f5
commit 7572f06
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/tags/TagManager.java b/src/main/java/net/aufdemrand/denizen/tags/TagManager.java
@@ -82,6 +82,12 @@ public void fetchObject(ReplaceableTagEvent event) {
                     .invoke(null, event.hasNameContext() ? event.getName() + '[' + event.getNameContext() + ']'
                             : event.getName());
 
+            if (arg == null) {
+                dB.echoError((event.hasNameContext() ? event.getName() + '[' + event.getNameContext() + ']'
+                        : event.getName() + " is an invalid dObject!"));
+                return;
+            }
+
             Attribute attribute = new Attribute(event.raw_tag, event.getScriptEntry());
             event.setReplaced(arg.getAttribute(attribute.fulfill(1)));
         } catch (Exception e) {