diff --git a/src/main/java/thetadev/constructionwand/wand/undo/PlaceSnapshot.java b/src/main/java/thetadev/constructionwand/wand/undo/PlaceSnapshot.java
index a53c9c0..63fae19 100644
--- a/src/main/java/thetadev/constructionwand/wand/undo/PlaceSnapshot.java
+++ b/src/main/java/thetadev/constructionwand/wand/undo/PlaceSnapshot.java
@@ -113,7 +113,7 @@ private static BlockState getPlaceBlockstate(World world, PlayerEntity player, B
         if(blockState.getBlock() == Blocks.AIR || !blockState.isValidPosition(world, pos)) return null;
 
         // Copy block properties from supporting block
-        if(targetMode) {
+        if(targetMode && supportingBlock != null) {
             // Block properties to be copied (alignment/rotation properties)
 
             for(Property property : new Property[]{