diff --git a/lib/compass/commands/registry.rb b/lib/compass/commands/registry.rb
index 64372079..3b5c0d16 100644
--- a/lib/compass/commands/registry.rb
+++ b/lib/compass/commands/registry.rb
@@ -16,8 +16,10 @@ module Compass::Commands
         matching.first
       elsif name =~ /^-/
         nil
-      else
+      elsif matching.size > 1
         raise Compass::Error, "Ambiguous abbreviation '#{name}'. Did you mean one of: #{matching.join(", ")}"
+      else
+        raise Compass::Error, "Command not found: #{name}"
       end
     end
     def abbreviation?(name)