Popups - error checking on event listner
Merge pull request #2622 from colemanw/fi

Popups - error checking on event listner