diff --git a/MCGalaxy/Commands/Command.cs b/MCGalaxy/Commands/Command.cs
index 1b3ded866..c7e405d01 100644
--- a/MCGalaxy/Commands/Command.cs
+++ b/MCGalaxy/Commands/Command.cs
@@ -104,7 +104,9 @@ namespace MCGalaxy {
                 grp.Commands.Remove(cmd);
             }
             
-            Alias.UnregisterDefaults(cmd);
+            // typically Command.Unregister(Command.Find("xyz"))
+            // So don't error if Command.Find returned null
+            if (cmd != null) Alias.UnregisterDefaults(cmd);
             return removed;
         }