PLINK-457: handle null entities variable
Merge pull request #307 from anilsaldhana/master

PLINK-457: handle null entities variable