Check properties are not null before dereferencing them
Merge pull request #41 from mleduque/IDEX-1254

Check properties are not null before dereferencing them