diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py
index c6df1052c..36cecafa4 100644
--- a/letsencrypt/cli.py
+++ b/letsencrypt/cli.py
@@ -676,11 +676,7 @@ def main(cli_args=sys.argv[1:]):
     except errors.Error as error:
         handle_exception_common()
         return error
-    except KeyboardInterrupt:
-        handle_exception_common()
-        # Ensures a new line is printed
-        return ""
-    except: # pylint: disable=bare-except
+    except Exception: # pylint: disable=broad-except
         handle_exception_common()
         return ("An unexpected error occured. Please see the logfiles in {0} "
                 "for more details.".format(args.logs_dir))
diff --git a/letsencrypt/tests/cli_test.py b/letsencrypt/tests/cli_test.py
index 6b8f77c62..6e826386b 100644
--- a/letsencrypt/tests/cli_test.py
+++ b/letsencrypt/tests/cli_test.py
@@ -67,11 +67,6 @@ class CLITest(unittest.TestCase):
             errors.Error, self._call, ['--debug'] + cmd_arg, attrs)
         self._call(cmd_arg, attrs)
 
-        attrs['view_config_changes.side_effect'] = [KeyboardInterrupt]
-        self.assertRaises(
-            KeyboardInterrupt, self._call, ['--debug'] + cmd_arg, attrs)
-        self._call(cmd_arg, attrs)
-
         attrs['view_config_changes.side_effect'] = [ValueError]
         self.assertRaises(
             ValueError, self._call, ['--debug'] + cmd_arg, attrs)