slightly more helpful error messages
Removed duplicate code
readded closing line
Merge pull request #1 from compstak/robin-dev

Better error messages