diff --git a/authors.txt b/authors.txt
index d982dfad9..72fe935c4 100644
--- a/authors.txt
+++ b/authors.txt
@@ -75,3 +75,4 @@ Roger Boerdijk
 melak47
 Philipp Ittershagen
 Dylan Baker
+Aaron Plattner
diff --git a/mesonbuild/mparser.py b/mesonbuild/mparser.py
index 7a9153919..a9f25b197 100644
--- a/mesonbuild/mparser.py
+++ b/mesonbuild/mparser.py
@@ -407,6 +407,7 @@ class Parser:
     def __init__(self, code, subdir):
         self.lexer = Lexer(code)
         self.stream = self.lexer.lex(subdir)
+        self.current = Token('eof', '', 0, 0, 0, (0, 0), None)
         self.getsym()
         self.in_ternary = False
 
diff --git a/test cases/common/144 empty build file/meson.build b/test cases/common/144 empty build file/meson.build
new file mode 100644
index 000000000..73d03974f
--- /dev/null
+++ b/test cases/common/144 empty build file/meson.build	
@@ -0,0 +1,2 @@
+project('subdir with empty meson.build test', 'c')
+subdir('subdir')
diff --git a/test cases/common/144 empty build file/subdir/meson.build b/test cases/common/144 empty build file/subdir/meson.build
new file mode 100644
index 000000000..e69de29bb