From facb3266c6c84d0da7a2d4df9052acdf8754af9d Mon Sep 17 00:00:00 2001
From: Zack Barett <arnett.zackary@gmail.com>
Date: Fri, 30 Oct 2020 08:55:30 -0500
Subject: [PATCH] Media Browser: Fix error handling (#7538)

---
 .../media-player/ha-media-player-browse.ts    | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/components/media-player/ha-media-player-browse.ts b/src/components/media-player/ha-media-player-browse.ts
index 8c17267fc4..93a5ca25e4 100644
--- a/src/components/media-player/ha-media-player-browse.ts
+++ b/src/components/media-player/ha-media-player-browse.ts
@@ -540,17 +540,20 @@ export class HaMediaPlayerBrowse extends LitElement {
     mediaContentType?: string
   ): Promise<MediaPlayerItem> {
     this._loading = true;
-    const itemData =
-      this.entityId !== BROWSER_PLAYER
-        ? await browseMediaPlayer(
-            this.hass,
-            this.entityId,
-            mediaContentId,
-            mediaContentType
-          )
-        : await browseLocalMediaPlayer(this.hass, mediaContentId);
-
-    this._loading = false;
+    let itemData: any;
+    try {
+      itemData =
+        this.entityId !== BROWSER_PLAYER
+          ? await browseMediaPlayer(
+              this.hass,
+              this.entityId,
+              mediaContentId,
+              mediaContentType
+            )
+          : await browseLocalMediaPlayer(this.hass, mediaContentId);
+    } finally {
+      this._loading = false;
+    }
     return itemData;
   }