Another case of 'don't shrink too much'
AND catch more timeout exceptions
Give the outer timeout a bit more time