#1470, remove popup should not error if called without popup