GearSwap - nil fixes
Merge pull request #859 from Windower/4.1-dev

GearSwap - nil fixes