Handle non-thrown 404 errors.
Merge pull request #5 from Firetrust/handle-404

Handle non-thrown 404 errors.