diff --git a/ortools/util/java/sorted_interval_list.i b/ortools/util/java/sorted_interval_list.i
index cdf6c982e8..12bc910031 100644
--- a/ortools/util/java/sorted_interval_list.i
+++ b/ortools/util/java/sorted_interval_list.i
@@ -13,8 +13,6 @@
 
 // This is the java SWIG wrapper for ../sorted_interval_list.h.  See that file.
 
-%include "ortools/base/base.i"
-
 %include "ortools/util/java/vector.i"
 
 %{
diff --git a/ortools/util/sorted_interval_list.cc b/ortools/util/sorted_interval_list.cc
index 844f263998..b3ddb8d572 100644
--- a/ortools/util/sorted_interval_list.cc
+++ b/ortools/util/sorted_interval_list.cc
@@ -152,6 +152,9 @@ Domain Domain::FromValues(std::vector<int64_t> values) {
     } else {
       result.intervals_.back().end = v;
     }
+    if (result.intervals_.back().end == std::numeric_limits<int64_t>::max()) {
+      break;
+    }
   }
   return result;
 }