GearSwap v0.816 - set_merge error handling