Added missing null check around storeProperty usage within SetProperties