Enhanced timeout handling