Better notification timeout handling.