Hygiene: Ensure property is set before accessing

Change-Id: I1f885a195139311d695ef20f0cb572a7f6c40bed