Improved notification of timeouts

Change-Id: I30ebb99df1ccf5284fec0974dcc9ff7b807e7b6a