needs review of error handling #18383
Signed-off-by: Andreas Fenkart andreas.fenkart@dev.digitalstrom.org