VIX-463 - Aborting rename to Mark Collection causes name to be erased.  Added null check to after label edit function.