Updated error messaging
Merged conflict