Ongoingmode nullpointer fixed