Fixing issue that caused null to be checked for a property.