diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index 5615bb8d1287..7e57e4aa888c 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -532,23 +532,29 @@ public function getSegments(): array
 
     /**
      * Returns the value of a specific segment of the URI path.
+     * Allows to get only existing segments or the next one.
      *
-     * @param int    $number  Segment number
+     * @param int    $number  Segment number starting at 1
      * @param string $default Default value
      *
-     * @return string The value of the segment. If no segment is found,
-     *                throws InvalidArgumentError
+     * @return string The value of the segment. If you specify the last +1
+     *                segment, the $default value. If you specify the last +2
+     *                or more throws HTTPException.
      */
     public function getSegment(int $number, string $default = ''): string
     {
-        // The segment should treat the array as 1-based for the user
-        // but we still have to deal with a zero-based array.
-        $number--;
+        if ($number < 1) {
+            throw HTTPException::forURISegmentOutOfRange($number);
+        }
 
-        if ($number > count($this->segments) && ! $this->silent) {
+        if ($number > count($this->segments) + 1 && ! $this->silent) {
             throw HTTPException::forURISegmentOutOfRange($number);
         }
 
+        // The segment should treat the array as 1-based for the user
+        // but we still have to deal with a zero-based array.
+        $number--;
+
         return $this->segments[$number] ?? $default;
     }
 
@@ -556,7 +562,8 @@ public function getSegment(int $number, string $default = ''): string
      * Set the value of a specific segment of the URI path.
      * Allows to set only existing segments or add new one.
      *
-     * @param mixed $value (string or int)
+     * @param int        $number Segment number starting at 1
+     * @param int|string $value
      *
      * @return $this
      */