not handled event NPE fixed