diff --git a/luna/include/luna/LinkedList.h b/luna/include/luna/LinkedList.h
index cb2e6c66..3c6bcb44 100644
--- a/luna/include/luna/LinkedList.h
+++ b/luna/include/luna/LinkedList.h
@@ -136,7 +136,8 @@ template <typename T> class LinkedList
 
     T* expect_first()
     {
-        return first().value();
+        check(m_start_node);
+        return m_start_node;
     }
 
     Option<T*> last()
@@ -146,7 +147,8 @@ template <typename T> class LinkedList
 
     T* expect_last()
     {
-        return last().value();
+        check(m_end_node);
+        return m_end_node;
     }
 
     Option<T*> next(T* item)