slightly improved exception handling