Ensuring we send 404s where appropriate