The fancy error checking was not working and just breaking things so it's out
Merge pull request #3 from okonomiyaki3000/a_few_minor_suggestions

No fancy error checking.