diff --git a/unshackle/core/services.py b/unshackle/core/services.py
index 88fa50f9..1bd0d74a 100644
--- a/unshackle/core/services.py
+++ b/unshackle/core/services.py
@@ -209,6 +209,8 @@ class Services(click.Group):
             result = client.get("/api/services")
             Services._remote_services_cache = result.get("services", [])
             return Services._remote_services_cache
+        except click.ClickException:
+            raise
         except Exception:
             return None