Error handling has been improved.
Merge branch 'ew-dev' into development