Added weapon exists check, adjusted client tracking