diff --git a/src/main/java/me/bobert/netneutrality/context/MessageCommandContext.java b/src/main/java/me/bobert/netneutrality/context/MessageCommandContext.java
index c4ae060..c41d12b 100644
--- a/src/main/java/me/bobert/netneutrality/context/MessageCommandContext.java
+++ b/src/main/java/me/bobert/netneutrality/context/MessageCommandContext.java
@@ -268,7 +268,10 @@ public class MessageCommandContext extends CommandContext {
                 invalidateContext(data, "the argument provided was not a number.");
             }
 
-            options.add(new MessageCommandOption(data, value));
+            if (value != null) {
+                options.add(new MessageCommandOption(data, value));
+            }
+
             index++;
         }
 
diff --git a/src/main/java/me/bobert/netneutrality/core/command/options/MessageCommandOption.java b/src/main/java/me/bobert/netneutrality/core/command/options/MessageCommandOption.java
index bc248d8..ab1f0b3 100644
--- a/src/main/java/me/bobert/netneutrality/core/command/options/MessageCommandOption.java
+++ b/src/main/java/me/bobert/netneutrality/core/command/options/MessageCommandOption.java
@@ -146,4 +146,12 @@ public class MessageCommandOption implements CommandOption {
         throw new IllegalStateException("Cannot resolve option of type " + type + " to GuildChannelUnion");
     }
 
+    @Override
+    public String toString() {
+        return "MessageCommandOption{" +
+                "name=" + data.getName() +
+                ", type=" + type +
+                ", value=" + value +
+                '}';
+    }
 }