Better error handling in AdvancedPropertiesFile, finished economy but didn't test