I know this was not in the previous version but I would have added a timeout listener as well.