Replaced incorrect 400 errors with 404 ones