changes based on review
Task #GDP-752 - Sonar Issue #2c8f4dd2-1148-48ac-8ef8-0206f891f792 - Exception handlers should provide some context and preserve the original exception