Fixing popup example.
s/throw/return/g in some tests