Uniformized timeout message

Regression from #538