Fixed #705
Merge pull request #711 from Dynious/nullItemFix

Fixes #705