WWW-2486 Improve Exception Handling