diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
index a470c8ec5fd..3c4a5ced556 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
@@ -831,7 +831,7 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg
                 //LOGGER.debug("Compare " + name + " with " + second.name + "=-1");
                 return -1;
             }
-            if (depend != null && (depend == null ? 0 : depend.size()) != (second.depend == null ? 0 : second.depend.size())) {
+            if (depend != null && depend.size() != (second.depend == null ? 0 : second.depend.size())) {
                 //LOGGER.debug("Compare " + name + " with " + second.name + "=D"
                 //        + (depend.size() - second.depend.size()));
                 return depend.size() - second.depend.size();
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ZapierClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ZapierClientCodegen.java
index 822add48ddf..d730606104b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ZapierClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ZapierClientCodegen.java
@@ -183,7 +183,7 @@ public class ZapierClientCodegen extends DefaultCodegen implements CodegenConfig
         CodegenResponse r = super.fromResponse(responseCode, response);
         try {
             Map<String, Map<String, Map<String, Object>>> map = Json.mapper().readerFor(Map.class).readValue(Json.pretty(response.getContent()));
-            Map.Entry<String, Map<String, Map<String, Object>>> entry = map.entrySet().stream().findFirst().get();
+            Map.Entry<String, Map<String, Map<String, Object>>> entry = map.entrySet().stream().findFirst().orElseThrow(()-> new IllegalStateException("no response object available"));
             Map<String, Map<String, Object>> example = entry.getValue();
             r.examples = toExamples(example.get("examples"));
         } catch (Exception e) {