diff --git a/src/services/command/CommandService.java b/src/services/command/CommandService.java
index 650bef26..c6a62435 100644
--- a/src/services/command/CommandService.java
+++ b/src/services/command/CommandService.java
@@ -478,7 +478,7 @@ public class CommandService implements INetworkDispatch  {
 				return;
 			}
 			
-			if(command.getHitType() == 0 && command.getBuffNameSelf().length() > 0) {
+			if(command.getHitType() == 0 && command.getBuffNameSelf() != null && command.getBuffNameSelf().length() > 0) {
 				core.combatService.doSelfBuff(attacker, weapon, command, actionCounter);
 				return;
 			}