Fixing issue with missing time-out checks