Move to the py2.6+ try/except style