Updated error messaging
Merge branch 'error-messaging' into dev