Improved exception handling some more.