TimeoutExceptions now get caught