Revert "Dotcase: Improve exception-handling"

This reverts commit bad81928dfc1ccb0ceb4e610c1182a4d13fcfb48.