Preventing NPE given we're no longer reporting status per step