Better error messages
Merge pull request #22 from ScottDowne/t1102463

Better error messages