Fix Panic with -t and -a stderr Upstream-commit: 5948b105e7dcc7428e9525ccb44d543169b47a6e Component: engine