diff --git a/build.gradle b/build.gradle
index 62a4134..167c356 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-version = '1.16.3-2.22'
+version = '1.16.3-2.23'
 group = 'nl.requios.effortlessbuilding' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'effortlessbuilding'
 
diff --git a/src/main/java/nl/requios/effortlessbuilding/EventHandler.java b/src/main/java/nl/requios/effortlessbuilding/EventHandler.java
index 60eca1a..9f5551f 100644
--- a/src/main/java/nl/requios/effortlessbuilding/EventHandler.java
+++ b/src/main/java/nl/requios/effortlessbuilding/EventHandler.java
@@ -112,7 +112,11 @@ public class EventHandler {
 			BuildModes.onBlockBroken(event.getPlayer(), event.getPos(), false);
 
 			//Add to undo stack in client
-			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) event.getPlayer()), new AddUndoMessage(event.getPos(), event.getState(), Blocks.AIR.getDefaultState()));
+			if (event.getPlayer() instanceof ServerPlayerEntity && event.getState() != null && event.getPos() != null) {
+				PacketDistributor.PacketTarget packetTarget = PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) event.getPlayer());
+				if (packetTarget != null)
+					PacketHandler.INSTANCE.send(packetTarget, new AddUndoMessage(event.getPos(), event.getState(), Blocks.AIR.getDefaultState()));
+			}
 		}
 	}