first attempt at fix (still needs normalization of the exception types)