diff --git a/src/main/scala/leon/purescala/TreeOps.scala b/src/main/scala/leon/purescala/TreeOps.scala
index 0f629386ce4a9fc79ff5689dd342a50d346c7a21..e9e2c66b15c05b29d796fb9a529cc74c5ec6c9fb 100644
--- a/src/main/scala/leon/purescala/TreeOps.scala
+++ b/src/main/scala/leon/purescala/TreeOps.scala
@@ -1121,7 +1121,8 @@ object TreeOps {
               } else {
                 Seq(c)
               }
-            case _ => Seq(c)
+            case _ => 
+              Seq(c)
           }}
 
           var finalMatch = MatchExpr(scrutinee, List(newCases.head)).setType(e.getType)
@@ -1339,6 +1340,7 @@ object TreeOps {
       case Tuple(Seq()) => UnitLiteral()
       case Variable(id) if idMap contains id => Variable(idMap(id))
 
+      case Error(err) => Error(err).setType(mapType(e.getType).getOrElse(e.getType)).copiedFrom(e)
       case Tuple(Seq(s)) => pre(s)
 
       case ts @ TupleSelect(t, 1) => t.getType match {