Add check to NextWeapon for #30