Bugfix for transforming NULL items (not found)
Merge branch 'release/v0.8.1'