Further improvements concerning exception handling

Signed-off-by: phillippohl <phillipp-ohl@web.de>