diff --git a/src/main/java/cr0s/warpdrive/WarpDrive.java b/src/main/java/cr0s/warpdrive/WarpDrive.java
index fcc54b74..f4fbe318 100644
--- a/src/main/java/cr0s/warpdrive/WarpDrive.java
+++ b/src/main/java/cr0s/warpdrive/WarpDrive.java
@@ -624,6 +624,10 @@ public class WarpDrive implements LoadingCallback {
 	}
 	
 	public static void addChatMessage(final ICommandSender sender, final String message) {
+		if (sender == null) {
+			logger.error("Unable to send message to NULL sender: " + message);
+			return;
+		}
 		String[] lines = message.replace("§", "" + (char)167).replace("\\n", "\n").split("\n");
 		for (String line : lines) {
 			sender.addChatMessage(new ChatComponentText(line));