1 files changed, 4 insertions, 1 deletions

diff --git a/src/intervals.c b/src/intervals.c
index 7809c37505b..e6254cbdf6a 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1315,7 +1315,10 @@ set_point (position, buffer)
     {
       toprev = to;
       to = next_interval (to);
-      position = to->position;
+      if (NULL_INTERVAL_P (to))
+        position = BUF_ZV (buffer);
+      else
+        position = to->position;
     }
 
   buffer->text.pt = position;