made a start on returning error messages
Merge branch 'feature/errors' into develop