Fix 404 error handling
Merge pull request #22 from artnez/fix-404-error-handling

Fix 404 error handling