Catch nulls in the InventoryHolder property, fixes #625

Fairly sure the && on line 79 shouldn't be there... but @Morphan1 keeps
insisting that it's needed for something, so just catch nulls manually
for now.