diff --git a/homeassistant/components/media_source/local_source.py b/homeassistant/components/media_source/local_source.py
index 34b526171ea6b..d670cee1676e9 100644
--- a/homeassistant/components/media_source/local_source.py
+++ b/homeassistant/components/media_source/local_source.py
@@ -83,6 +83,8 @@ def _browse_media(self, source_dir_id, location):
         full_path = Path(self.hass.config.path("media", location))
 
         if not full_path.exists():
+            if location == "":
+                raise BrowseError("Media directory does not exist.")
             raise BrowseError("Path does not exist.")
 
         if not full_path.is_dir():
diff --git a/homeassistant/components/spotify/media_player.py b/homeassistant/components/spotify/media_player.py
index ccc51ad41a6c2..e7b3d4a4552ac 100644
--- a/homeassistant/components/spotify/media_player.py
+++ b/homeassistant/components/spotify/media_player.py
@@ -598,7 +598,7 @@ def library_payload():
                 {"name": item["name"], "type": item["type"], "uri": item["type"]}
             )
         )
-    return library_info
+    return BrowseMedia(**library_info)
 
 
 def fetch_image_url(item, key="images"):