Add error handling to EntitiesByPropertyValue

Change-Id: I14da12256386e25879954daa0f97b9a4364c7362