diff --git a/public/app/core/utils/fetch.ts b/public/app/core/utils/fetch.ts
index 284a5848309..fb77a6d1a7d 100644
--- a/public/app/core/utils/fetch.ts
+++ b/public/app/core/utils/fetch.ts
@@ -105,7 +105,12 @@ export async function parseResponseBody<T>(
         return response.blob() as any;
 
       case 'json':
-        return response.json();
+        try {
+          return await response.json();
+        } catch (err) {
+          console.warn(`${response.url} returned an invalid JSON -`, err);
+          return {} as unknown as T;
+        }
 
       case 'text':
         return response.text() as any;
diff --git a/public/app/features/plugins/admin/state/actions.ts b/public/app/features/plugins/admin/state/actions.ts
index 68a47c7ebad..e23bf4b0b0e 100644
--- a/public/app/features/plugins/admin/state/actions.ts
+++ b/public/app/features/plugins/admin/state/actions.ts
@@ -73,6 +73,8 @@ export const install = createAsyncThunk(
 
       return { id, changes } as Update<CatalogPlugin>;
     } catch (e) {
+      console.error(e);
+
       return thunkApi.rejectWithValue('Unknown error.');
     }
   }
@@ -90,6 +92,8 @@ export const uninstall = createAsyncThunk(`${STATE_PREFIX}/uninstall`, async (id
       changes: { isInstalled: false, installedVersion: undefined },
     } as Update<CatalogPlugin>;
   } catch (e) {
+    console.error(e);
+
     return thunkApi.rejectWithValue('Unknown error.');
   }
 });