tried to be a bit more helpful with throwing exceptions at the right place, but that fails some tests. Now hopefully a compromise ...
Authored by: vsp_nagel 2015-07-16
Parent: [r33919]
Child: [r33921]
