Fix issue with reloading data causing errors with addons