refactored error message
Merge branch 'Jon'