Fix bug TimeOut exception and allow 'touch' as handler