Can't you wrap this wait in a Timeout block?