diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar
index 368fd1d..10d5093 100644
Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ
diff --git a/src/sig/plugin/TwosideKeeper/CustomDamage.java b/src/sig/plugin/TwosideKeeper/CustomDamage.java
index 8056b78..c140434 100644
--- a/src/sig/plugin/TwosideKeeper/CustomDamage.java
+++ b/src/sig/plugin/TwosideKeeper/CustomDamage.java
@@ -502,7 +502,7 @@ public class CustomDamage {
 				increaseSwordComboCount(weapon, p);
 			}
 			performMegaKnockback(damager,target);
-			if (damager instanceof Arrow || weapon.getType()!=Material.BOW) { 
+			if ((damager!=null && damager instanceof Arrow) || (weapon!=null && weapon.getType()!=Material.BOW)) { 
 				removePermEnchantments(p,weapon);
 			}
 			//GenericFunctions.knockOffGreed(p);