diff --git a/poc-hexagonal_architecture/src/main/java/es/rbailen/sample/hexagonalarchitecture/domain/service/ProductService.java b/poc-hexagonal_architecture/src/main/java/es/rbailen/sample/hexagonalarchitecture/domain/service/ProductService.java
index 18113f3..75f2e87 100644
--- a/poc-hexagonal_architecture/src/main/java/es/rbailen/sample/hexagonalarchitecture/domain/service/ProductService.java
+++ b/poc-hexagonal_architecture/src/main/java/es/rbailen/sample/hexagonalarchitecture/domain/service/ProductService.java
@@ -27,13 +27,7 @@ public class ProductService implements CreateProductUseCase, GetProductUseCase {
 
     @Override
     public Product getProductById(Long id) {
-        Optional<Product> product = productOutputPort.getProductById(id);
-
-        if(product.isEmpty()) {
-            throw new ProductNotFound("Product not found with id " + id);
-        }
-
-        return product.get();
+        return productOutputPort.getProductById(id).orElseThrow(() -> new ProductNotFound("Product not found with id " + id));
     }
 
 }