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 ad1daacbf1..0f9ff1b7c2 100644
--- a/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java
+++ b/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java
@@ -738,16 +738,16 @@ else if(streamAPIStatements1.size() > 0 && streamAPIStatements2.size() == 0) {
 						boolean unmatchedParent = false;
 						while(parent1 != null && parent2 != null) {
 							if(parent1.getParent() == null || parent2.getParent() == null) {
-								if(parent1 instanceof TryStatementObject && parent1.getParent().getParent() == null) {
+								if(parent1 instanceof TryStatementObject) {
 									break;
 								}
-								if(parent2 instanceof TryStatementObject && parent2.getParent().getParent() == null) {
+								if(parent2 instanceof TryStatementObject) {
 									break;
 								}
-								if(parent1.getLocationInfo().getCodeElementType().equals(CodeElementType.FINALLY_BLOCK) && parent1.getParent().getParent() == null) {
+								if(parent1.getLocationInfo().getCodeElementType().equals(CodeElementType.FINALLY_BLOCK)) {
 									break;
 								}
-								if(parent2.getLocationInfo().getCodeElementType().equals(CodeElementType.FINALLY_BLOCK) && parent2.getParent().getParent() == null) {
+								if(parent2.getLocationInfo().getCodeElementType().equals(CodeElementType.FINALLY_BLOCK)) {
 									break;
 								}
 								if(child1.getAnonymousClassDeclarations().size() > 0 && child2.getAnonymousClassDeclarations().size() > 0) {