fix 404
Merge pull request #152 from lepilepi/master

Fixing the new 404 handling