Merge "[TASK] Throw exception instead of die"
drwxr-xr-x - typo3