Re-fix and backport of #860 (Robustness issue in exception catching).
Re-fix and backport of #860 (Robustness issue in exception catching).

--HG--
extra : convert_revision : svn%3Ae1d34091-3ce9-0310-8e96-997e60db3bd5/trunk%402250

cherrypy/magicbus