make sure status is never undefined and log error
Merge branch 'develop' into qa

* develop:
  make sure status is never undefined and log error