Consider potentially non-existing modvar
Merge pull request #1772 from Guite/1.4

Consider potentially non-existing modvar