Using HttpStatus instead of hardcoded 404