diff --git a/binstar_client/scripts/cli.py b/binstar_client/scripts/cli.py
index 7a5c8bb7..6534a84d 100644
--- a/binstar_client/scripts/cli.py
+++ b/binstar_client/scripts/cli.py
@@ -45,7 +45,7 @@ def file_or_token(value):
 
 def _custom_excepthook(logger, show_traceback=False):
     def excepthook(exc_type, exc_value, exc_traceback):
-        if issubclass(exc_type, KeyboardInterrupt) or not issubclass(exc_type, errors.ServerError):
+        if issubclass(exc_type, KeyboardInterrupt):
             return
 
         if show_traceback: