diff --git a/src/compiler/GF/Command/Commands2.hs b/src/compiler/GF/Command/Commands2.hs
index b5335479c..08caf705d 100644
--- a/src/compiler/GF/Command/Commands2.hs
+++ b/src/compiler/GF/Command/Commands2.hs
@@ -804,12 +804,16 @@ prMorphoAnalysis (w,lps) =
 hsExpr c =
   case unApp c of
     Just (f,cs) -> H.mkApp (H.mkCId f) (map hsExpr cs)
-    _ -> error "GF.Command.Commands2.hsExpr"
+    _ -> case unStr c of
+           Just str -> H.mkStr str
+           _ -> error $ "GF.Command.Commands2.hsExpr "++show c
 
 cExpr e =
   case H.unApp e of
     Just (f,es) -> mkApp (H.showCId f) (map cExpr es)
-    _ -> error "GF.Command.Commands2.cExpr"
+    _ -> case H.unStr e of
+           Just str -> mkStr str
+           _ -> error $ "GF.Command.Commands2.cExpr "++show e
 
 needPGF exec opts ts =
   do Env mb_pgf cncs <- getPGFEnv