Changed issues

try and catch when setting up the economy to prevent errors, combined two of the same methods