Simplify exception handling.
Fix some comics.