From ca8c6d2f5d4cf5081086be2463c63d56c981a6f5 Mon Sep 17 00:00:00 2001
From: daniel <6771667+danielalmqvist@users.noreply.github.com>
Date: Tue, 15 Jul 2025 10:06:00 +0200
Subject: [PATCH] Add Null-check and return if null (#21556)

---
 .../codegen/languages/ProtobufSchemaCodegen.java           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java
index 6dee36ccfe9..b3fb96b7f11 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java
@@ -1105,14 +1105,17 @@ public class ProtobufSchemaCodegen extends DefaultCodegen implements CodegenConf
                 addtionalPropertiesName = schema.getTitle();
             } else {
                 Schema additionalProperties = ModelUtils.getAdditionalProperties(schema);
-                if (additionalProperties.getTitle() != null) {
+                if(additionalProperties == null) {
+                   return; 
+                } else if (additionalProperties.getTitle() != null) {
                     addtionalPropertiesName = additionalProperties.getTitle();
                 } else if (additionalProperties.get$ref() != null) {
                     String ref = ModelUtils.getSimpleRef(additionalProperties.get$ref());
                     addtionalPropertiesName = toVarName(toModelName(ref));
                 }
             }
-            properties.put(addtionalPropertiesName, schema);
+            
+            properties.put(addtionalPropertiesName, schema);        
         }
     }
 }