diff --git a/bin/etherpump b/bin/etherpump
index 7e9c608..93e8f41 100755
--- a/bin/etherpump
+++ b/bin/etherpump
@@ -52,16 +52,18 @@ try:
     else:
         args = sys.argv[2:]
 
-    if any(arg in args for arg in ['--help', '-h']):
-        print(usage)
-        sys.exit(0)
-    elif any(arg in args for arg in ['--version', '-v']):
-        print('etherpump {}'.format(__VERSION__))
-        sys.exit(0)
+    if len(sys.argv) < 3:
+        if any(arg in args for arg in ['--help', '-h']):
+            print(usage)
+            sys.exit(0)
+        elif any(arg in args for arg in ['--version', '-v']):
+            print('etherpump {}'.format(__VERSION__))
+            sys.exit(0)
 
 except IndexError:
     print(usage)
     sys.exit(0)
+
 try:
     # http://stackoverflow.com/questions/301134/dynamic-module-import-in-python
     cmdmod = __import__(