Exception error message handling upgraded ...