diff --git a/mopidy/core/library.py b/mopidy/core/library.py
index 35ed02c1..6fc1ce38 100644
--- a/mopidy/core/library.py
+++ b/mopidy/core/library.py
@@ -68,7 +68,9 @@ class LibraryController(object):
 
         .. versionadded:: 0.18
         """
-        return self._roots() if uri is None else self._browse(uri)
+        if uri is None:
+            return self._roots()
+        return self._browse(uri)
 
     def _roots(self):
         directories = set()
@@ -87,7 +89,7 @@ class LibraryController(object):
         backend = self.backends.with_library_browse.get(scheme)
         try:
             if backend:
-                return backend.library.browse(uri).get()  # TODO: sort?
+                return backend.library.browse(uri).get()
         except Exception:
             logger.exception('%s backend caused an exception.',
                              backend.actor_ref.actor_class.__name__)
diff --git a/tests/core/test_library.py b/tests/core/test_library.py
index 9cb2588d..89f3b284 100644
--- a/tests/core/test_library.py
+++ b/tests/core/test_library.py
@@ -443,7 +443,7 @@ class BackendFailuresCoreLibraryTest(unittest.TestCase):
         self.assertEqual([], self.core.library.browse(None))
         logger.exception.assert_called_with(mock.ANY, 'DummyBackend')
 
-    def test_browse_backend_browse_uri_exception_gets_through(self, logger):
+    def test_browse_backend_browse_uri_exception_gets_ignored(self, logger):
         self.library.browse.return_value.get.side_effect = Exception
         self.assertEqual([], self.core.library.browse('dummy:directory'))
         logger.exception.assert_called_with(mock.ANY, 'DummyBackend')