fixed timeouts / error reporting