Merge "Fix error when creating TimeoutException"