Enhance/refactore the exception handling on the rich client.