#11: handle 404 and 500
Merge pull request #40 from prestaconcept/Issue11_handle_404_500

#11: handle 404 and 500