diff --git a/src/GF/Compile/GrammarToGFCC.hs b/src/GF/Compile/GrammarToGFCC.hs
index cc34cf546..23f1484e6 100644
--- a/src/GF/Compile/GrammarToGFCC.hs
+++ b/src/GF/Compile/GrammarToGFCC.hs
@@ -450,7 +450,11 @@ term2term fun cgr env@(labels,untyps,typs) tr = case tr of
        let v = comp v0 
        let mv1 = Map.lookup v untyps
        case mv1 of 
-         Just v1 -> return $ (comp . (ts !!) . fromInteger) v1 
+         Just v0 -> 
+           let v1 = fromInteger v0
+               v2 = v1 --if length ts > v1 then v1 
+                       --else trace ("DEBUG" +++ show v1 +++ "of" +++ show ts) 0
+           in return $ (comp . (ts !!)) v2 
          _ -> return (S (comp tb) v) 
                   
      R r -> R [(l,(ty,comp t)) | (l,(ty,t)) <- r]
diff --git a/src/GFI.hs b/src/GFI.hs
index a38481cbe..04c4c5d75 100644
--- a/src/GFI.hs
+++ b/src/GFI.hs
@@ -119,7 +119,8 @@ loop opts gfenv0 = do
           _ -> do
             interpretCommandLine enc env s
             loopNewCPU gfenv
-        gfenv' <- return $ either (const gfenv) id r
+--        gfenv' <- return $ either (const gfenv) id r
+        gfenv' <- either (\e -> (print e >> return gfenv)) return r
         loop opts gfenv'
 
 importInEnv :: GFEnv -> Options -> [FilePath] -> IO GFEnv