Added an error
Fixed a bug
Merge branch 'feature/er-restapi' into development