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..3e3e90e 100644
--- a/index.json
+++ b/index.json
@@ -1,6 +1,12 @@
 {
   "plugin_manager_url": "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugin_manager.py",
   "versions": {
+    "0.3.5": {
+      "api_version": 7,
+      "commit_sha": "985e486",
+      "released_on": "15-06-2023",
+      "md5sum": "5da137a353b4fa35e4d9926107cf4754"
+    },
     "0.3.4": {
       "api_version": 7,
       "commit_sha": "2d74b52",
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()
diff --git a/plugins/maps.json b/plugins/maps.json
index f5b8fe4..7d509ef 100644
--- a/plugins/maps.json
+++ b/plugins/maps.json
@@ -3,7 +3,7 @@
   "description": "Maps",
   "plugins_base_url": "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugins/maps",
   "plugins": {
-    "forest_map": {
+    "forest": {
       "description": "Basically bridgit map but outter version",
       "external_url": "",
       "authors": [
@@ -14,8 +14,13 @@
         }
       ],
       "versions": {
-        "1.0.0": null
-      },
-    },
+        "1.0.0": {
+          "api_version": 7,
+          "commit_sha": "985e486",
+          "released_on": "15-06-2023",
+          "md5sum": "01fb81dc27d63789f31559140ec2bd72"
+        }
+      }
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/test/auto_apply_version_metadata.py b/test/auto_apply_version_metadata.py
index 5dd8b5b..1f8719a 100644
--- a/test/auto_apply_version_metadata.py
+++ b/test/auto_apply_version_metadata.py
@@ -205,6 +205,10 @@ def auto_apply_version_metadata(last_commit_sha):
     category_json = utilities.apply_version_metadata_to_null_version_values(last_commit_sha)
     utilities.save(category_json)
 
+    maps = CategoryVersionMetadata(os.path.join("plugins", "maps"))
+    category_json = maps.apply_version_metadata_to_null_version_values(last_commit_sha)
+    maps.save(category_json)
+
     minigames = CategoryVersionMetadata(os.path.join("plugins", "minigames"))
     category_json = minigames.apply_version_metadata_to_null_version_values(last_commit_sha)
     minigames.save(category_json)
diff --git a/test/test_checks.py b/test/test_checks.py
index d338419..4971bfe 100644
--- a/test/test_checks.py
+++ b/test/test_checks.py
@@ -163,6 +163,15 @@ class TestUtilitiesCategoryMetadata(BaseCategoryMetadataTestCases.BaseTest):
             self.content = json.load(fin)
 
 
+class TestMapsCategoryMetadata(BaseCategoryMetadataTestCases.BaseTest):
+    def setUp(self):
+        super().setUp()
+        self.name = "Maps"
+        self.category = os.path.join("plugins", "maps")
+        with open(f"{self.category}.json", "rb") as fin:
+            self.content = json.load(fin)
+
+
 class TestMinigamesCategoryMetadata(BaseCategoryMetadataTestCases.BaseTest):
     def setUp(self):
         super().setUp()