Merge "Deal with finalize() after failed constructor"