Error handling appears broken for requests returning 404 (ObjectNotFound)

[tehkillerbee]

In #366 a subtle bug was introduced, causing certain errors (404 etc.) to never be triggered. This breaks most of the error handling that depends on ObjectNotFound.