Merge pull request #259 from HPI-Information-Systems/exceptions
Merge branch 'master' into exceptions
Fix test.