Improve exception handling

[Schlevidon]

Summary

Treat exceptions consistently in the code base, i.e. ideally define all possible exceptions (with consistent identifiers) in one place.