This is a safe change now that we no longer support the older properties. However i have added the null check in there.