Fix setting property on null