Changed the timeout behaviour for non-blocking retry loops.