[3.0] Prevention of NULL pointer dereference at EventHandler