Fix case when status is nil