diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0c878b..44bebd0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt
 - Update paths to screenshots for examples ([270](https://github.com/cucumber/godog/pull/270) - [leviable])
 - Made progress formatter verification a bit more accurate ([lonnblad])
 - Added comparison between single and multi threaded runs ([272](https://github.com/cucumber/godog/pull/272) - [lonnblad])
+- Fixed issue with empty feature file causing nil pointer deref ([288](https://github.com/cucumber/godog/pull/288) - [lonnblad])
 
 ## [0.9.0]
 
diff --git a/features/empty.feature b/features/empty.feature
new file mode 100644
index 0000000..e69de29