diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index f59e6322..17f77e86 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -46,6 +46,11 @@ if __name__ == '__main__':
     try:
         main()
     except KeyboardInterrupt:
-        sys.exit('\nInterrupted by user')
+        logger.info(u'Interrupted by user')
+        sys.exit(0)
     except SettingsError, e:
-        sys.exit('%s' % e)
+        logger.error(e)
+        sys.exit(1)
+    except SystemExit, e:
+        logger.error(e)
+        sys.exit(1)