From da6f7c94fd010aa77b9664b0c1a56a1bbac18a74 Mon Sep 17 00:00:00 2001
From: tsantalis <tsantalis@gmail.com>
Date: Fri, 10 Jan 2025 12:18:48 -0500
Subject: [PATCH] Fix for issue #849

---
 .../gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java b/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java
index b897b197a..2102eba6e 100644
--- a/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java
+++ b/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java
@@ -8301,7 +8301,9 @@ else if(isIfBranch(grandParent, grandParent.getParent()) && !hasElseBranch(grand
 						while(parent != null && parent.getLocationInfo().getCodeElementType().equals(CodeElementType.BLOCK)) { 
 							parent = parent.getParent(); 
 						}
-						grandParents.add(parent);
+						if(parent != null) {
+							grandParents.add(parent);
+						}
 					}
 					if(container1.getBody() != null && grandParents.size() == 1) {
 						CompositeStatementObject grandParent2 = grandParents.iterator().next();