drop some 2.5-compat exception handling