Fix property store null