Add 404 error code to exception
Merge branch 'master' into stable