diff --git a/ChangeLog.md b/ChangeLog.md
index 589cc14c..ec682723 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -2,7 +2,7 @@ This is the master changelog for Elite Dangerous Market Connector.  Entries are
 ---
 * We currently test against, and package with, Python 3.13, 64-bit.
 ---
-Pre-Release 6.1.0-beta3
+Pre-Release 6.1.0-beta4
 ===
 This release includes the new EDMC Plugin Browser, which allows plugin authors to register their plugins. 
 These registered plugins will be able to be browsed and discovered by all EDMC Users!
@@ -21,7 +21,7 @@ prevent various unexpected situations which could prevent updates or contacting
 * Improved the handling of Lang comment detection.
 * Improved the utility of the various core plugin System and Station providers.
 * Migrates the Translations wiki page to docs/Translations.md.
-* Simplified the location that modules.json and ships.json should be expected to be.
+* Simplified the location that modules.json and ships.json should be expected to be for update simplicity.
 * Minor code improvements.
 * Simplified handling code for EDDN messages.
 
diff --git a/collate.py b/collate.py
index 191f2580..07830770 100755
--- a/collate.py
+++ b/collate.py
@@ -18,10 +18,10 @@ import os
 import pathlib
 import sys
 from traceback import print_exc
-
 import companion
 import outfitting
 from config import config
+from update import check_for_fdev_updates
 from edmc_data import companion_category_map, ship_name_map
 
 
@@ -50,10 +50,11 @@ def addcommodities(data) -> None:  # noqa: CCR001
     if not data['lastStarport'].get('commodities'):
         return
 
-    try:
-        commodityfile = config.app_dir_path / 'FDevIDs' / 'commodity.csv'
-    except FileNotFoundError:
-        commodityfile = pathlib.Path('FDevIDs/commodity.csv')
+    commodityfile = config.app_dir_path / 'FDevIDs' / 'commodity.csv'
+    if not commodityfile.is_file():
+        check_for_fdev_updates()
+        commodityfile = config.app_dir_path / 'FDevIDs' / 'commodity.csv'  # Probably first boot. Force update.
+
     commodities = {}
 
     # slurp existing
diff --git a/config/__init__.py b/config/__init__.py
index 2c632701..ed43c3fe 100644
--- a/config/__init__.py
+++ b/config/__init__.py
@@ -54,7 +54,7 @@ appcmdname = "EDMC"
 # <https://semver.org/#semantic-versioning-specification-semver>
 # Major.Minor.Patch(-prerelease)(+buildmetadata)
 # NB: Do *not* import this, use the functions appversion() and appversion_nobuild()
-_static_appversion = "6.1.0-beta3"
+_static_appversion = "6.1.0-beta4"
 _cached_version: semantic_version.Version | None = None
 copyright = "© 2015-2019 Jonathan Harris, 2020-2025 EDCD"
 
diff --git a/update.py b/update.py
index 51b6c838..aebabf5e 100644
--- a/update.py
+++ b/update.py
@@ -242,15 +242,6 @@ class Updater:
         # Always trigger FDEV checks here too
         check_for_fdev_updates()
         check_for_datafile_updates()
-        try:
-            check_for_fdev_updates(local=True)
-            check_for_datafile_updates(local=True)
-        except Exception as e:
-            logger.info(
-                "Tried to update bundle files but failed. Don't worry, "
-                "this likely isn't important and can be ignored unless "
-                f"you run into other issues. If you're curious: {e}"
-            )
 
     def shutdown_request(self) -> None:
         """Receive (Win)Sparkle shutdown request and send it to parent."""
@@ -318,13 +309,6 @@ class Updater:
 
         check_for_fdev_updates()
         check_for_datafile_updates()
-        try:
-            check_for_fdev_updates(local=True)
-            check_for_datafile_updates(local=True)
-        except Exception as e:
-            logger.info("Tried to update bundle files but failed. Don't worry, "
-                        "this likely isn't important and can be ignored unless"
-                        f" you run into other issues. If you're curious: {e}")
 
     def check_appcast(self) -> EDMCVersion | None:
         """