Fix null-value in returned multi-reference refs
Fix null-value in returned multi-reference refs

With d566b43468e0497c6da2a6b3fee744e4ad8a8b99 I fixed a bug, but introduced another. Sorry about that.
vgno/data-shaper