diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddb321a..85ebd58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Plugin Manager (dd-mm-yyyy)
 
+### 0.3.5 (16-06-2023)
+
+- Replace the "Loading..." text with the exception message in case something goes wrong.
+
 ### 0.3.4 (14-05-2023)
 
 - Optimize new plugin detection mechanism.
diff --git a/index.json b/index.json
index 4fbe385..ba8c58b 100644
--- a/index.json
+++ b/index.json
@@ -1,6 +1,7 @@
 {
   "plugin_manager_url": "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugin_manager.py",
   "versions": {
+    "0.3.5": null,
     "0.3.4": {
       "api_version": 7,
       "commit_sha": "2d74b52",
@@ -98,4 +99,4 @@
     "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugins/maps.json"
   ],
   "external_source_url": "https://github.com/{repository}/{content_type}/{tag}/category.json"
-}
\ No newline at end of file
+}
diff --git a/plugin_manager.py b/plugin_manager.py
index fd10350..ea83afe 100644
--- a/plugin_manager.py
+++ b/plugin_manager.py
@@ -25,7 +25,7 @@ _env = _ba.env()
 _uiscale = ba.app.ui.uiscale
 
 
-PLUGIN_MANAGER_VERSION = "0.3.4"
+PLUGIN_MANAGER_VERSION = "0.3.5"
 REPOSITORY_URL = "https://github.com/bombsquad-community/plugin-manager"
 # Current tag can be changed to "staging" or any other branch in
 # plugin manager repo for testing purpose.
@@ -1538,6 +1538,10 @@ class PluginManagerWindow(ba.Window):
         except RuntimeError:
             # User probably went back before a ba.Window could finish loading.
             pass
+        except Exception as e:
+            ba.textwidget(edit=self._plugin_manager_status_text,
+                          text=str(e))
+            raise
 
     async def draw_index(self):
         self.draw_search_bar()