Safer onUpdate in ItemProxy, should fix #1187
Merge pull request #1190 from tterrag1098/patch-4

Safer onUpdate in ItemProxy, should fix #1187