diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMotd.java b/src/com/massivecraft/factions/cmd/CmdFactionsMotd.java
index e4d22928..2d30f543 100644
--- a/src/com/massivecraft/factions/cmd/CmdFactionsMotd.java
+++ b/src/com/massivecraft/factions/cmd/CmdFactionsMotd.java
@@ -42,8 +42,11 @@ public class CmdFactionsMotd extends FactionsCommand
 		// Args
 		String target = this.readArg();
 
-		target = target.trim();
-		target = Txt.parse(target);
+		if (target != null)
+		{
+			target = target.trim();
+			target = Txt.parse(target);
+		}
 
 		// Get Old
 		String old = msenderFaction.getMotd();