diff --git a/client/solo/main.py b/client/solo/main.py
index c3fa72b00..6544ad57a 100644
--- a/client/solo/main.py
+++ b/client/solo/main.py
@@ -291,7 +291,8 @@ def main():
         # argv -> equo --bashcomp equo repo
         # and we need to drop --bashcomp and
         # argv[2]
-        args.pop(0)
+        if args:
+            args.pop(0)
 
     cmd = None
     last_arg = None