error reporting
Sub update
Merge branch 'develop'

* develop:
  Sub update
  error reporting