diff --git a/src/main/java/net/knarcraft/placeholdersigns/listener/SignClickListener.java b/src/main/java/net/knarcraft/placeholdersigns/listener/SignClickListener.java
index 1e58468..4c52a8c 100644
--- a/src/main/java/net/knarcraft/placeholdersigns/listener/SignClickListener.java
+++ b/src/main/java/net/knarcraft/placeholdersigns/listener/SignClickListener.java
@@ -385,7 +385,10 @@ public class SignClickListener implements Listener {
         String oldPlaceholder = null;
         if (targetPlaceholderSign != null) {
             // Remove the old placeholder
-            oldPlaceholder = targetPlaceholderSign.getPlaceholders().get(targetSide).remove(destinationLine);
+            Map<Integer, String> placeholders = targetPlaceholderSign.getPlaceholders().get(targetSide);
+            if (placeholders != null) {
+                oldPlaceholder = placeholders.remove(destinationLine);
+            }
         }
 
         lines[destinationLine] = newText;