error handling
Merge branch 'master' into dev
handling error status update