Add a null check to getLastEntryFromFlag

DenizenScript · Feb 19, 2015 · 9f93dec · 9f93dec
1 parent a1b6759
commit 9f93dec
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/net/aufdemrand/denizen/Denizen.java b/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -1278,7 +1278,11 @@ else if (arg.indexOf('@') == 2) {
 
     @Override
     public String getLastEntryFromFlag(String flag) {
-        return getFlag(flag).getLast().asString();
+        FlagManager.Flag theflag = getFlag(flag);
+        if (theflag == null || theflag.getLast() == null) {
+            return null;
+        }
+        return theflag.getLast().asString();
     }
 
     @Override