Adding check if status is None.