diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 5031dfcd8..0c3ecfe6c 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -747,7 +747,7 @@ class Application(QApplication):
             # event loop, so we can shut down immediately.
             self._shutdown(status)
 
-    def _shutdown(self, status):  # noqa
+    def _shutdown(self, status):  # noqa, pylint: disable=too-many-branches
         """Second stage of shutdown."""
         log.destroy.debug("Stage 2 of shutting down...")
         # Remove eventfilter
diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py
index 6062a7ad8..520b0db2b 100644
--- a/qutebrowser/utils/usertypes.py
+++ b/qutebrowser/utils/usertypes.py
@@ -401,8 +401,8 @@ class ObjectRegistry(collections.UserDict):
         Prevents duplicated registrations.
         """
         if name in self.data:
-            raise KeyError("Object '{}' is already registered in scope "
-                           "'{}' ({})!".format(name, scope, self.data[name]))
+            raise KeyError("Object '{}' is already registered ({})!".format(
+                           name, repr(self.data[name])))
         super().__setitem__(name, obj)
 
     def dump_objects(self):