Merge "Check null before calling clone()"