diff --git a/opm/parser/eclipse/Parser/Parser.cpp b/opm/parser/eclipse/Parser/Parser.cpp
index d2712bce5..0949dfa79 100644
--- a/opm/parser/eclipse/Parser/Parser.cpp
+++ b/opm/parser/eclipse/Parser/Parser.cpp
@@ -68,7 +68,7 @@ inline Itr find_terminator( Itr begin, Itr end, Term terminator ) {
 
     auto pos = terminator( begin, end );
 
-    if( pos == end ) return end;
+    if( pos == begin || pos == end) return pos;
 
     auto qbegin = std::find_if( begin, end, RawConsts::is_quote() );