Throw 404 error when appropriate
Better error handling
Merge pull request #9 from Rise-Vision/fix/return-404

Throw 404 error when appropriate