Forgot a NPE check