Fixed error with non-set data-object