From 5fbabdefca77fcb1bb3d9e03c96776bab30fe637 Mon Sep 17 00:00:00 2001
From: nitram84 <58364572+nitram84@users.noreply.github.com>
Date: Thu, 15 Feb 2024 18:57:30 +0100
Subject: [PATCH] fix: NPE in unused EcxHandler block removal code (#2086) (PR
 #2104)

---
 .../jadx/core/dex/visitors/blocks/BlockExceptionHandler.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockExceptionHandler.java b/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockExceptionHandler.java
index 822c90ddaea..f6206c7aeac 100644
--- a/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockExceptionHandler.java
+++ b/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockExceptionHandler.java
@@ -600,7 +600,7 @@ private static void removeUnusedExcHandlers(MethodNode mth, List<TryCatchBlockAt
 		for (ExceptionHandler eh : mth.getExceptionHandlers()) {
 			boolean notProcessed = true;
 			BlockNode handlerBlock = eh.getHandlerBlock();
-			if (blocks.get(handlerBlock)) {
+			if (handlerBlock == null || blocks.get(handlerBlock)) {
 				continue;
 			}
 			for (TryCatchBlockAttr tcb : tryBlocks) {