[TASK] Avoid inconsistent return points

Change-Id: I2512c412e6c3263719bf99f31c3bddbea6a0899f
Reviewed-on: https://review.typo3.org/31373
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters