diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar
index 0e5b939..bf4d0cf 100644
Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ
diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java
index c406ce9..db04b42 100644
--- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java
+++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java
@@ -3111,7 +3111,8 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
 	@EventHandler(priority=EventPriority.LOW,ignoreCancelled = true)
     public void onPlayerSwapItem(PlayerSwapHandItemsEvent ev) {
 		Player p = ev.getPlayer();
-    	if (ArrowQuiver.isValidQuiver(ev.getMainHandItem())) {
+    	if (ev.getMainHandItem()!=null &&
+    			ev.getMainHandItem().getType()==Material.BOW && ArrowQuiver.isValidQuiver(ev.getMainHandItem())) {
     		ev.setCancelled(true);
     		//Swap forward or backward modes, depending on whether we are sneaking of not.
     		ItemStack quiver = p.getEquipment().getItemInOffHand();