Summary: Inserted code to convert specific exceptions, case-by-case, plus a test.
Reviewed-by: jrose, twisti