Added hack to bubble timeout errors