Refactor poor exception handling

[tatiana]

One exception was hiding the original problem and not giving further details.
The other exception handling didn't add any value.

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.35%. Comparing base (540b33a) to head (a36297b).
Report is 2 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #259      +/-   ##
==========================================
+ Coverage   89.04%   89.35%   +0.30%     
==========================================
  Files           8        8              
  Lines         648      648              
==========================================
+ Hits          577      579       +2     
+ Misses         71       69       -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.