diff --git a/src/lexer/lexer.c b/src/lexer/lexer.c
index c135497..1a630e3 100644
--- a/src/lexer/lexer.c
+++ b/src/lexer/lexer.c
@@ -291,6 +291,13 @@ struct token *peek_token(void)
                 break;
             }
         }
+        else if (stream[i] == EOF)
+        {
+            fprintf(stderr, "Lexing error: unmatched quote\n");
+
+            // error handling
+            return NULL;
+        }
         i++;
     }
 
@@ -332,6 +339,13 @@ struct token *pop_token(void)
                 break;
             }
         }
+        else if (stream[i] == EOF)
+        {
+            fprintf(stderr, "Lexing error: unmatched quote\n");
+
+            // error handling
+            return NULL;
+        }
         i++;
     }