Update error handlers
Merge branch 'develop'