diff --git a/src/main/java/org/spongepowered/api/command/manager/CommandMapping.java b/src/main/java/org/spongepowered/api/command/manager/CommandMapping.java
index 3b577756c7..519f086a85 100644
--- a/src/main/java/org/spongepowered/api/command/manager/CommandMapping.java
+++ b/src/main/java/org/spongepowered/api/command/manager/CommandMapping.java
@@ -27,6 +27,7 @@
 import org.spongepowered.api.command.registrar.CommandRegistrar;
 import org.spongepowered.plugin.PluginContainer;
 
+import java.util.Optional;
 import java.util.Set;
 
 /**
@@ -59,11 +60,11 @@ public interface CommandMapping {
     Set<String> allAliases();
 
     /**
-     * Gets the plugin that owns the command.
+     * Gets the plugin that owns the command, if known.
      *
      * @return The plugin.
      */
-    PluginContainer plugin();
+    Optional<PluginContainer> plugin();
 
     /**
      * Gets the {@link CommandRegistrar} that registered this command.