Return Response NotFound instead of null