1 files changed, 9 insertions, 3 deletions
diff --git a/gbp/scripts/config.py b/gbp/scripts/config.py
index 3856c829..9ff31185 100755
--- a/gbp/scripts/config.py
+++ b/gbp/scripts/config.py
@@ -17,11 +17,12 @@
 #
 """Query and display config file values"""
 
-from six.moves import configparser
 import sys
-import os, os.path
+import os
 from gbp.config import GbpOptionParser
+from gbp.errors import GbpError
 from gbp.scripts.supercommand import import_command
+from gbp.scripts.common import ExitCodes
 import gbp.log
 
 
@@ -29,7 +30,7 @@ def build_parser(name):
     try:
         parser = GbpOptionParser(command=os.path.basename(name), prefix='',
                                  usage='%prog [options] command[.optionname] - display configuration settings')
-    except configparser.ParsingError as err:
+    except GbpError as err:
         gbp.log.err(err)
         return None
 
@@ -117,6 +118,10 @@ def main(argv):
     retval = 1
 
     (options, args) = parse_args(argv)
+
+    if options is None:
+        return ExitCodes.parse_error
+
     gbp.log.setup(options.color, options.verbose, options.color_scheme)
 
     if not args:
@@ -131,6 +136,7 @@ def main(argv):
     retval = print_cmd_values(query, value_printer)
     return retval
 
+
 if __name__ == '__main__':
     sys.exit(main(sys.argv))