Updating clone to handle null