Fixed error when dismissing name pop-up