diff --git a/fdroid b/fdroid
index c59578cf..ac32d7c1 100755
--- a/fdroid
+++ b/fdroid
@@ -22,6 +22,7 @@ import sys
 import logging
 
 from fdroidserver.common import FDroidException
+from optparse import OptionError
 
 commands = {
     "build": "Build a package from source",
@@ -96,6 +97,9 @@ def main():
         else:
             logging.critical(str(e))
         sys.exit(1)
+    except OptionError, e:
+        logging.critical(str(e))
+        sys.exit(1)
     except KeyboardInterrupt:
         print('')
         sys.exit(1)