Change 404 in favor of 400