Fixing NPE related to economy