master
Fixing error messaging