fatal errors return 500s
Merge pull request #6 from usnavi/master

fatal errors return 500s