Added 404 for bad requests