diff --git a/src/main/java/com/denizenscript/denizen2sponge/events/server/CommandSentScriptEvent.java b/src/main/java/com/denizenscript/denizen2sponge/events/server/CommandSentScriptEvent.java
index 0688231..432f144 100644
--- a/src/main/java/com/denizenscript/denizen2sponge/events/server/CommandSentScriptEvent.java
+++ b/src/main/java/com/denizenscript/denizen2sponge/events/server/CommandSentScriptEvent.java
@@ -87,9 +87,15 @@ public HashMap<String, AbstractTagObject> getDefinitions(ScriptEventData data) {
         defs.put("args", args);
         defs.put("raw_args", raw_args);
         defs.put("source", source);
-        defs.put("player", player);
-        defs.put("location", location);
-        defs.put("entity", entity);
+        if (player != null) {
+            defs.put("player", player);
+        }
+        if (location != null) {
+            defs.put("location", location);
+        }
+        if (entity != null) {
+            defs.put("entity", entity);
+        }
         return defs;
     }