I am having the exact same error! and I can't exit the popup to choose options for the return, even though I can see the option in the left to return to the old...