Add null check for property in property lookup

e.g. in case of a deleted property or other reason

Change-Id: I396df7016ccbcff3c5a5cf01d3bf2a708a30181b
Merge "Add null check for property in property lookup"