diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java
index 05a9d1536d4..c9785fc2155 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java
@@ -1007,7 +1007,7 @@ public class K6ClientCodegen extends DefaultCodegen implements CodegenConfig {
                 && cgOperation.vendorExtensions.get(X_OPERATION_GROUPING) instanceof java.util.Map) {
 
             Map.Entry<?, ?> operationGroupingEntry = ((Map<?, ?>) cgOperation.vendorExtensions
-                    .get(X_OPERATION_GROUPING)).entrySet().stream().findFirst().get();
+                    .get(X_OPERATION_GROUPING)).entrySet().stream().findFirst().orElse(null);
 
             return Optional.of(new OperationGrouping(String.valueOf(operationGroupingEntry.getKey()),
                     Integer.parseInt(String.valueOf(operationGroupingEntry.getValue()))));
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
index 1a64e3909ab..8409e2d7f8c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
@@ -144,7 +144,7 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
                 .reduce((a, b) -> {
                     throw new IllegalStateException("Multiple elements: " + a + ", " + b);
                 })
-                .get();
+                .orElse(null);
         supportingFiles.remove(originalInitModel);
         supportingFiles.add(new SupportingFile("__init__model.mustache", packagePath() + File.separatorChar + "model", "__init__.py"));
         supportingFiles.add(new SupportingFile("__init__apis.mustache", packagePath() + File.separatorChar + "apis", "__init__.py"));