Fixed the exception mapping problems.