diff --git a/src/core/Buffer-Cursor.cc b/src/core/Buffer-Cursor.cc
index 4be2df1..c9e64f8 100644
--- a/src/core/Buffer-Cursor.cc
+++ b/src/core/Buffer-Cursor.cc
@@ -13,7 +13,7 @@ bool Buffer::Cursor::is_start_of_line()
 
 bool Buffer::Cursor::is_end_of_line(bool allow_eol)
 {
-    if (*m_iterator == '\n')
+    if ((*m_iterator == '\n') || (!m_iterator.valid()))
     {
         return true;
     }