Amended error messages and written some specific error handling tests.
Fixed some minor typos.