Tested and fixed up the error messages
more