Move timeout check into delegate methods