Merge pull request #103 from datamade/master

add 404 and 500 error handling