Fix property reference on null