Error handling improved
Merge branch 'qa' into development