Prevent NPE in fluid lookup for block
Merge pull request #784 from viliml/patch-1

Prevent NPE in fluid lookup for block