diff --git a/onionshare/onion.py b/onionshare/onion.py
index 03dfde2c..ca3a6e67 100644
--- a/onionshare/onion.py
+++ b/onionshare/onion.py
@@ -58,7 +58,6 @@ class TorErrorUnreadableCookieFile(Exception):
     """
     pass
 
-
 class NoTor(Exception):
     """
     This exception is raised if onionshare can't find a Tor control port
diff --git a/onionshare/onionshare.py b/onionshare/onionshare.py
index c87b7811..6537f105 100644
--- a/onionshare/onionshare.py
+++ b/onionshare/onionshare.py
@@ -155,10 +155,11 @@ def main(cwd=None):
         app = OnionShare(debug, local_only, stay_open, transparent_torification, stealth)
         app.choose_port()
         app.start_onion_service()
-    except onion.NoTor as e:
-        sys.exit(e.args[0])
-    except onion.TorTooOld as e:
+    except (onion.NoTor, onion.TorTooOld, onion.TorErrorInvalidSetting, onion.TorErrorSocketPort, onion.TorErrorSocketFile, onion.TorErrorMissingPassword, onion.TorErrorUnreadableCookieFile) as e:
         sys.exit(e.args[0])
+    except KeyboardInterrupt:
+        print("")
+        sys.exit()
 
     # prepare files to share
     print(strings._("preparing_files"))