Just changing some error messages to more appropriate ones.
Merge branch 'Angus'_Branch'