Revert "Fix Sonar warning:  Exception handlers should provide some context and preserve the original exception"

This reverts commit 99d3c151ed78651b0d5b76173259829d3bade815.