Fix null pointer issue
Merge pull request #1 from SocraticGrid/VMR-related-fixes

Fix null pointer issue