Fixing NPE hopefully