diff --git a/src/runtime/haskell/PGF.hs b/src/runtime/haskell/PGF.hs
index 309959555..654e9858f 100644
--- a/src/runtime/haskell/PGF.hs
+++ b/src/runtime/haskell/PGF.hs
@@ -257,8 +257,10 @@ parse_ :: PGF -> Language -> Type -> Maybe Int -> String -> (ParseOutput [Expr],
 parse_ gr (CId lang) cat dp sent =
   case Map.lookup lang (PGF2.languages gr) of
     Just cnc -> case (PGF2.parse cnc cat sent,dp) of
-                  (ParseOk ts, Just n) -> (ParseOk (map fst (take n ts)),noBS)
-                  --(res,              ) -> res
+                  (ParseOk ts,     Just n) -> (ParseOk (map fst (take n ts)),noBS)
+                  (ParseOk ts,    Nothing) -> (ParseOk (map fst ts),noBS)
+                  (ParseFailed pos,_     ) -> (ParseFailed pos,noBS)
+                  (ParseIncomplete,_     ) -> (ParseIncomplete,noBS)
     Nothing  -> error ("Unknown language: " ++ lang)
 
 complete :: PGF -> Language -> Type -> String -> String -> (BracketedString,String,Map.Map Token [CId])