[BUGFIX] fix again TYPO3 CORE BUG #44440 as with 6.0.5 we now have two different execptions
Merge remote-tracking branch 'upstream/master'