Fixed #18; returns a 404 rather than a 500 error