More error checking
Syntax error fix
Stupid typo
Another dumb bug
Merge pull request #15 from gregdek/master

Additional error checking