Stupid NPE fixed