Merge "Fix exception when delete an uninitialized object"