Add basic pretty type errors to all errors

82 files changed, 412 insertions, 82 deletions

diff --git a/dhall/tests/type-errors/hurkensParadox.txt b/dhall/tests/type-errors/hurkensParadox.txt
index 522e1a2..6b99615 100644
--- a/dhall/tests/type-errors/hurkensParadox.txt
+++ b/dhall/tests/type-errors/hurkensParadox.txt
@@ -1,4 +1,4 @@
-Type error: Unhandled error: error: wrong type of function argument
+Type error: error: wrong type of function argument
   --> <current file>:6:23
    |
  1 |     let bottom : Type = ∀(any : Type) → any
diff --git a/dhall/tests/type-errors/mixedUnions.txt b/dhall/tests/type-errors/mixedUnions.txt
index fd4de70..8e0026d 100644
--- a/dhall/tests/type-errors/mixedUnions.txt
+++ b/dhall/tests/type-errors/mixedUnions.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: InvalidFieldType
+Type error: error: InvalidFieldType
+ --> <current file>:1:0
+  |
+1 | < Left : Natural | Right : Type >
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ InvalidFieldType
+  |
diff --git a/dhall/tests/type-errors/unit/AnnotationRecordWrongFieldName.txt b/dhall/tests/type-errors/unit/AnnotationRecordWrongFieldName.txt
index 946b296..2a754fc 100644
--- a/dhall/tests/type-errors/unit/AnnotationRecordWrongFieldName.txt
+++ b/dhall/tests/type-errors/unit/AnnotationRecordWrongFieldName.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: annot mismatch: ({ x = 1 } : { x : Natural }) : { y : Natural }
+Type error: error: annot mismatch: ({ x = 1 } : { x : Natural }) : { y : Natural }
+ --> <current file>:1:0
+  |
+1 | { x = 1 } : { y : Natural }
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ annot mismatch: ({ x = 1 } : { x : Natural }) : { y : Natural }
+  |
diff --git a/dhall/tests/type-errors/unit/AnnotationRecordWrongFieldType.txt b/dhall/tests/type-errors/unit/AnnotationRecordWrongFieldType.txt
index 89817db..e67edb8 100644
--- a/dhall/tests/type-errors/unit/AnnotationRecordWrongFieldType.txt
+++ b/dhall/tests/type-errors/unit/AnnotationRecordWrongFieldType.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: annot mismatch: ({ x = 1 } : { x : Natural }) : { x : Text }
+Type error: error: annot mismatch: ({ x = 1 } : { x : Natural }) : { x : Text }
+ --> <current file>:1:0
+  |
+1 | { x = 1 } : { x : Text }
+  | ^^^^^^^^^^^^^^^^^^^^^^^^ annot mismatch: ({ x = 1 } : { x : Natural }) : { x : Text }
+  |
diff --git a/dhall/tests/type-errors/unit/AssertAlphaTrap.txt b/dhall/tests/type-errors/unit/AssertAlphaTrap.txt
index e4584f5..7e27d00 100644
--- a/dhall/tests/type-errors/unit/AssertAlphaTrap.txt
+++ b/dhall/tests/type-errors/unit/AssertAlphaTrap.txt
@@ -1,4 +1,4 @@
-Type error: Unhandled error: error: unbound variable ``_``
+Type error: error: unbound variable ``_``
  --> <current file>:1:46
   |
 1 | assert : (\(_: Bool) -> _) === (\(x: Bool) -> _)
diff --git a/dhall/tests/type-errors/unit/AssertDoubleZeros.txt b/dhall/tests/type-errors/unit/AssertDoubleZeros.txt
index d8627ba..12231a0 100644
--- a/dhall/tests/type-errors/unit/AssertDoubleZeros.txt
+++ b/dhall/tests/type-errors/unit/AssertDoubleZeros.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: AssertMismatch
+Type error: error: AssertMismatch
+ --> <current file>:1:0
+  |
+1 | assert : -0.0 ≡ +0.0
+  | ^^^^^^^^^^^^^^^^^^^^ AssertMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/AssertNotEquivalence.txt b/dhall/tests/type-errors/unit/AssertNotEquivalence.txt
index 537d31a..5973d19 100644
--- a/dhall/tests/type-errors/unit/AssertNotEquivalence.txt
+++ b/dhall/tests/type-errors/unit/AssertNotEquivalence.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: AssertMustTakeEquivalence
+Type error: error: AssertMustTakeEquivalence
+ --> <current file>:1:0
+  |
+1 | assert : Bool
+  | ^^^^^^^^^^^^^ AssertMustTakeEquivalence
+  |
diff --git a/dhall/tests/type-errors/unit/AssertTriviallyFalse.txt b/dhall/tests/type-errors/unit/AssertTriviallyFalse.txt
index d8627ba..5742022 100644
--- a/dhall/tests/type-errors/unit/AssertTriviallyFalse.txt
+++ b/dhall/tests/type-errors/unit/AssertTriviallyFalse.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: AssertMismatch
+Type error: error: AssertMismatch
+ --> <current file>:1:0
+  |
+1 | assert : 1 === 2
+  | ^^^^^^^^^^^^^^^^ AssertMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/EquivalenceNotSameType.txt b/dhall/tests/type-errors/unit/EquivalenceNotSameType.txt
index 89749e9..12e21e4 100644
--- a/dhall/tests/type-errors/unit/EquivalenceNotSameType.txt
+++ b/dhall/tests/type-errors/unit/EquivalenceNotSameType.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: EquivalenceTypeMismatch
+Type error: error: EquivalenceTypeMismatch
+ --> <current file>:1:0
+  |
+1 | 1 === False
+  | ^^^^^^^^^^^ EquivalenceTypeMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/EquivalenceNotTerms.txt b/dhall/tests/type-errors/unit/EquivalenceNotTerms.txt
index de11e28..0183c60 100644
--- a/dhall/tests/type-errors/unit/EquivalenceNotTerms.txt
+++ b/dhall/tests/type-errors/unit/EquivalenceNotTerms.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: EquivalenceArgumentsMustBeTerms
+Type error: error: EquivalenceArgumentsMustBeTerms
+ --> <current file>:1:0
+  |
+1 | Bool === Bool
+  | ^^^^^^^^^^^^^ EquivalenceArgumentsMustBeTerms
+  |
diff --git a/dhall/tests/type-errors/unit/FunctionApplicationArgumentNotMatch.txt b/dhall/tests/type-errors/unit/FunctionApplicationArgumentNotMatch.txt
index 01facbc..07278b8 100644
--- a/dhall/tests/type-errors/unit/FunctionApplicationArgumentNotMatch.txt
+++ b/dhall/tests/type-errors/unit/FunctionApplicationArgumentNotMatch.txt
@@ -1,4 +1,4 @@
-Type error: Unhandled error: error: wrong type of function argument
+Type error: error: wrong type of function argument
  --> <current file>:1:1
   |
 1 | (λ(_ : Natural) → _) True
diff --git a/dhall/tests/type-errors/unit/FunctionApplicationIsNotFunction.txt b/dhall/tests/type-errors/unit/FunctionApplicationIsNotFunction.txt
index f779fd6..e46904a 100644
--- a/dhall/tests/type-errors/unit/FunctionApplicationIsNotFunction.txt
+++ b/dhall/tests/type-errors/unit/FunctionApplicationIsNotFunction.txt
@@ -1,4 +1,4 @@
-Type error: Unhandled error: error: expected function, found `Bool`
+Type error: error: expected function, found `Bool`
  --> <current file>:1:0
   |
 1 | True True
diff --git a/dhall/tests/type-errors/unit/FunctionArgumentTypeNotAType.txt b/dhall/tests/type-errors/unit/FunctionArgumentTypeNotAType.txt
index 3fc1652..e84eb15 100644
--- a/dhall/tests/type-errors/unit/FunctionArgumentTypeNotAType.txt
+++ b/dhall/tests/type-errors/unit/FunctionArgumentTypeNotAType.txt
@@ -1,4 +1,4 @@
-Type error: Unhandled error: error: Invalid input type: `Natural`
+Type error: error: Invalid input type: `Natural`
  --> <current file>:1:6
   |
 1 | λ(_ : 1) → _
diff --git a/dhall/tests/type-errors/unit/FunctionTypeArgumentTypeNotAType.txt b/dhall/tests/type-errors/unit/FunctionTypeArgumentTypeNotAType.txt
index 948c6c7..4aa0f4f 100644
--- a/dhall/tests/type-errors/unit/FunctionTypeArgumentTypeNotAType.txt
+++ b/dhall/tests/type-errors/unit/FunctionTypeArgumentTypeNotAType.txt
@@ -1,4 +1,4 @@
-Type error: Unhandled error: error: Invalid input type: `Natural`
+Type error: error: Invalid input type: `Natural`
  --> <current file>:1:0
   |
 1 | 2 → _
diff --git a/dhall/tests/type-errors/unit/IfBranchesNotMatch.txt b/dhall/tests/type-errors/unit/IfBranchesNotMatch.txt
index 6b1dcdd..d58af95 100644
--- a/dhall/tests/type-errors/unit/IfBranchesNotMatch.txt
+++ b/dhall/tests/type-errors/unit/IfBranchesNotMatch.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: IfBranchMismatch
+Type error: error: IfBranchMismatch
+ --> <current file>:1:0
+  |
+1 | if True then 1 else ""
+  | ^^^^^^^^^^^^^^^^^^^^^^ IfBranchMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/IfBranchesNotType.txt b/dhall/tests/type-errors/unit/IfBranchesNotType.txt
index 06039a7..b70ac5f 100644
--- a/dhall/tests/type-errors/unit/IfBranchesNotType.txt
+++ b/dhall/tests/type-errors/unit/IfBranchesNotType.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: IfBranchMustBeTerm
+Type error: error: IfBranchMustBeTerm
+ --> <current file>:1:0
+  |
+1 | if True then Type else Type
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ IfBranchMustBeTerm
+  |
diff --git a/dhall/tests/type-errors/unit/IfNotBool.txt b/dhall/tests/type-errors/unit/IfNotBool.txt
index b2d200c..eb5ff42 100644
--- a/dhall/tests/type-errors/unit/IfNotBool.txt
+++ b/dhall/tests/type-errors/unit/IfNotBool.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: InvalidPredicate
+Type error: error: InvalidPredicate
+ --> <current file>:1:0
+  |
+1 | if 1 then 1 else 1
+  | ^^^^^^^^^^^^^^^^^^ InvalidPredicate
+  |
diff --git a/dhall/tests/type-errors/unit/LetWithWrongAnnotation.txt b/dhall/tests/type-errors/unit/LetWithWrongAnnotation.txt
index cae4fea..5ba4b35 100644
--- a/dhall/tests/type-errors/unit/LetWithWrongAnnotation.txt
+++ b/dhall/tests/type-errors/unit/LetWithWrongAnnotation.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: annot mismatch: (True : Bool) : Natural
+Type error: error: annot mismatch: (True : Bool) : Natural
+ --> <current file>:1:8
+  |
+1 | let x : Natural = True in True
+  |         ^^^^^^^ annot mismatch: (True : Bool) : Natural
+  |
diff --git a/dhall/tests/type-errors/unit/ListLiteralEmptyNotType.txt b/dhall/tests/type-errors/unit/ListLiteralEmptyNotType.txt
index aa7c8c5..2ca5819 100644
--- a/dhall/tests/type-errors/unit/ListLiteralEmptyNotType.txt
+++ b/dhall/tests/type-errors/unit/ListLiteralEmptyNotType.txt
@@ -1,4 +1,4 @@
-Type error: Unhandled error: error: wrong type of function argument
+Type error: error: wrong type of function argument
  --> <current file>:1:5
   |
 1 | [] : List Type
diff --git a/dhall/tests/type-errors/unit/ListLiteralNotType.txt b/dhall/tests/type-errors/unit/ListLiteralNotType.txt
index 3937453..62d69e5 100644
--- a/dhall/tests/type-errors/unit/ListLiteralNotType.txt
+++ b/dhall/tests/type-errors/unit/ListLiteralNotType.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: InvalidListType
+Type error: error: InvalidListType
+ --> <current file>:1:0
+  |
+1 | [ Bool ]
+  | ^^^^^^^^ InvalidListType
+  |
diff --git a/dhall/tests/type-errors/unit/ListLiteralTypesNotMatch.txt b/dhall/tests/type-errors/unit/ListLiteralTypesNotMatch.txt
index a64cf67..33e007d 100644
--- a/dhall/tests/type-errors/unit/ListLiteralTypesNotMatch.txt
+++ b/dhall/tests/type-errors/unit/ListLiteralTypesNotMatch.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: InvalidListElement
+Type error: error: InvalidListElement
+ --> <current file>:1:0
+  |
+1 | [ True, 1 ]
+  | ^^^^^^^^^^^ InvalidListElement
+  |
diff --git a/dhall/tests/type-errors/unit/MergeAlternativeHasNoHandler.txt b/dhall/tests/type-errors/unit/MergeAlternativeHasNoHandler.txt
index 711d77d..a4a967a 100644
--- a/dhall/tests/type-errors/unit/MergeAlternativeHasNoHandler.txt
+++ b/dhall/tests/type-errors/unit/MergeAlternativeHasNoHandler.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: MergeVariantMissingHandler
+Type error: error: MergeVariantMissingHandler
+ --> <current file>:1:0
+  |
+1 | merge {=} (< x : Bool >.x True)
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MergeVariantMissingHandler
+  |
diff --git a/dhall/tests/type-errors/unit/MergeAnnotationMismatch.txt b/dhall/tests/type-errors/unit/MergeAnnotationMismatch.txt
index 823f2f7..9175f33 100644
--- a/dhall/tests/type-errors/unit/MergeAnnotationMismatch.txt
+++ b/dhall/tests/type-errors/unit/MergeAnnotationMismatch.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: MergeAnnotMismatch
+Type error: error: MergeAnnotMismatch
+ --> <current file>:1:0
+  |
+1 | merge { x = 0 } < x >.x : Bool
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MergeAnnotMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/MergeAnnotationNotType.txt b/dhall/tests/type-errors/unit/MergeAnnotationNotType.txt
index 4c72653..1173f0c 100644
--- a/dhall/tests/type-errors/unit/MergeAnnotationNotType.txt
+++ b/dhall/tests/type-errors/unit/MergeAnnotationNotType.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: Merge2ArgMustBeUnionOrOptional
+Type error: error: Merge2ArgMustBeUnionOrOptional
+ --> <current file>:1:0
+  |
+1 | merge {=} <> : Type
+  | ^^^^^^^^^^^^^^^^^^^ Merge2ArgMustBeUnionOrOptional
+  |
diff --git a/dhall/tests/type-errors/unit/MergeEmptyNeedsDirectAnnotation1.txt b/dhall/tests/type-errors/unit/MergeEmptyNeedsDirectAnnotation1.txt
index 563b3bf..94442e0 100644
--- a/dhall/tests/type-errors/unit/MergeEmptyNeedsDirectAnnotation1.txt
+++ b/dhall/tests/type-errors/unit/MergeEmptyNeedsDirectAnnotation1.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: MergeEmptyNeedsAnnotation
+Type error: error: MergeEmptyNeedsAnnotation
+ --> <current file>:1:13
+  |
+1 | \(x: <>) -> (merge {=} x) : Bool
+  |              ^^^^^^^^^^^ MergeEmptyNeedsAnnotation
+  |
diff --git a/dhall/tests/type-errors/unit/MergeEmptyNeedsDirectAnnotation2.txt b/dhall/tests/type-errors/unit/MergeEmptyNeedsDirectAnnotation2.txt
index 563b3bf..5dcffdf 100644
--- a/dhall/tests/type-errors/unit/MergeEmptyNeedsDirectAnnotation2.txt
+++ b/dhall/tests/type-errors/unit/MergeEmptyNeedsDirectAnnotation2.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: MergeEmptyNeedsAnnotation
+Type error: error: MergeEmptyNeedsAnnotation
+ --> <current file>:1:26
+  |
+1 | \(x: <>) -> let y: Bool = merge {=} x in 1
+  |                           ^^^^^^^^^^^ MergeEmptyNeedsAnnotation
+  |
diff --git a/dhall/tests/type-errors/unit/MergeEmptyWithoutAnnotation.txt b/dhall/tests/type-errors/unit/MergeEmptyWithoutAnnotation.txt
index 4c72653..bf45123 100644
--- a/dhall/tests/type-errors/unit/MergeEmptyWithoutAnnotation.txt
+++ b/dhall/tests/type-errors/unit/MergeEmptyWithoutAnnotation.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: Merge2ArgMustBeUnionOrOptional
+Type error: error: Merge2ArgMustBeUnionOrOptional
+ --> <current file>:1:0
+  |
+1 | merge {=} <>
+  | ^^^^^^^^^^^^ Merge2ArgMustBeUnionOrOptional
+  |
diff --git a/dhall/tests/type-errors/unit/MergeHandlerNotFunction.txt b/dhall/tests/type-errors/unit/MergeHandlerNotFunction.txt
index 053a054..8528f90 100644
--- a/dhall/tests/type-errors/unit/MergeHandlerNotFunction.txt
+++ b/dhall/tests/type-errors/unit/MergeHandlerNotFunction.txt
@@ -1,4 +1,4 @@
-Type error: Unhandled error: error: merge handler is not a function
+Type error: error: merge handler is not a function
  --> <current file>:1:0
   |
 1 | merge { x = True } (< x : Bool >.x True)
diff --git a/dhall/tests/type-errors/unit/MergeHandlerNotInUnion.txt b/dhall/tests/type-errors/unit/MergeHandlerNotInUnion.txt
index 4c72653..3159340 100644
--- a/dhall/tests/type-errors/unit/MergeHandlerNotInUnion.txt
+++ b/dhall/tests/type-errors/unit/MergeHandlerNotInUnion.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: Merge2ArgMustBeUnionOrOptional
+Type error: error: Merge2ArgMustBeUnionOrOptional
+ --> <current file>:1:0
+  |
+1 | merge { x = λ(_ : Bool) → _ } <> : Bool
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Merge2ArgMustBeUnionOrOptional
+  |
diff --git a/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt b/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
index faca63a..c2229bd 100644
--- a/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
+++ b/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
@@ -1,4 +1,4 @@
-Type error: Unhandled error: error: Wrong handler input type
+Type error: error: Wrong handler input type
  --> <current file>:1:0
   |
 1 | merge { x = λ(_ : Bool) → _ } (< x : Natural >.x 1)
diff --git a/dhall/tests/type-errors/unit/MergeHandlersWithDifferentType.txt b/dhall/tests/type-errors/unit/MergeHandlersWithDifferentType.txt
index 8b729a4..47f3de7 100644
--- a/dhall/tests/type-errors/unit/MergeHandlersWithDifferentType.txt
+++ b/dhall/tests/type-errors/unit/MergeHandlersWithDifferentType.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: MergeHandlerTypeMismatch
+Type error: error: MergeHandlerTypeMismatch
+ --> <current file>:1:0
+  |
+1 | merge { x = λ(_ : Bool) → _, y = λ(_ : Natural) → _ } (< x : Bool | y : Natural >.x True)
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MergeHandlerTypeMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/MergeLhsNotRecord.txt b/dhall/tests/type-errors/unit/MergeLhsNotRecord.txt
index d151710..f27dddd 100644
--- a/dhall/tests/type-errors/unit/MergeLhsNotRecord.txt
+++ b/dhall/tests/type-errors/unit/MergeLhsNotRecord.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: Merge1ArgMustBeRecord
+Type error: error: Merge1ArgMustBeRecord
+ --> <current file>:1:0
+  |
+1 | merge True < x >.x
+  | ^^^^^^^^^^^^^^^^^^ Merge1ArgMustBeRecord
+  |
diff --git a/dhall/tests/type-errors/unit/MergeMissingHandler1.txt b/dhall/tests/type-errors/unit/MergeMissingHandler1.txt
index 711d77d..af58d05 100644
--- a/dhall/tests/type-errors/unit/MergeMissingHandler1.txt
+++ b/dhall/tests/type-errors/unit/MergeMissingHandler1.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: MergeVariantMissingHandler
+Type error: error: MergeVariantMissingHandler
+ --> <current file>:1:0
+  |
+1 | merge {=} <x>.x
+  | ^^^^^^^^^^^^^^^ MergeVariantMissingHandler
+  |
diff --git a/dhall/tests/type-errors/unit/MergeMissingHandler2.txt b/dhall/tests/type-errors/unit/MergeMissingHandler2.txt
index 711d77d..49484df 100644
--- a/dhall/tests/type-errors/unit/MergeMissingHandler2.txt
+++ b/dhall/tests/type-errors/unit/MergeMissingHandler2.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: MergeVariantMissingHandler
+Type error: error: MergeVariantMissingHandler
+ --> <current file>:1:0
+  |
+1 | merge { x = 0 } <x | y>.x
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^ MergeVariantMissingHandler
+  |
diff --git a/dhall/tests/type-errors/unit/MergeRhsNotUnion.txt b/dhall/tests/type-errors/unit/MergeRhsNotUnion.txt
index 4c72653..0108725 100644
--- a/dhall/tests/type-errors/unit/MergeRhsNotUnion.txt
+++ b/dhall/tests/type-errors/unit/MergeRhsNotUnion.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: Merge2ArgMustBeUnionOrOptional
+Type error: error: Merge2ArgMustBeUnionOrOptional
+ --> <current file>:1:0
+  |
+1 | merge {=} True
+  | ^^^^^^^^^^^^^^ Merge2ArgMustBeUnionOrOptional
+  |
diff --git a/dhall/tests/type-errors/unit/MergeUnusedHandler.txt b/dhall/tests/type-errors/unit/MergeUnusedHandler.txt
index a429b89..2afe376 100644
--- a/dhall/tests/type-errors/unit/MergeUnusedHandler.txt
+++ b/dhall/tests/type-errors/unit/MergeUnusedHandler.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: MergeHandlerMissingVariant
+Type error: error: MergeHandlerMissingVariant
+ --> <current file>:1:0
+  |
+1 | merge { x = 1, y = 2 } < x >.x
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MergeHandlerMissingVariant
+  |
diff --git a/dhall/tests/type-errors/unit/NaturalSubtractNotNatural.txt b/dhall/tests/type-errors/unit/NaturalSubtractNotNatural.txt
index 7e410c4..ac336a6 100644
--- a/dhall/tests/type-errors/unit/NaturalSubtractNotNatural.txt
+++ b/dhall/tests/type-errors/unit/NaturalSubtractNotNatural.txt
@@ -1,4 +1,4 @@
-Type error: Unhandled error: error: wrong type of function argument
+Type error: error: wrong type of function argument
  --> <current file>:1:0
   |
 1 | Natural/subtract True True
diff --git a/dhall/tests/type-errors/unit/OperatorAndNotBool.txt b/dhall/tests/type-errors/unit/OperatorAndNotBool.txt
index 9f10587..f6ea50b 100644
--- a/dhall/tests/type-errors/unit/OperatorAndNotBool.txt
+++ b/dhall/tests/type-errors/unit/OperatorAndNotBool.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: BinOpTypeMismatch
+Type error: error: BinOpTypeMismatch
+ --> <current file>:1:0
+  |
+1 | 1 && 1
+  | ^^^^^^ BinOpTypeMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/OperatorEqualNotBool.txt b/dhall/tests/type-errors/unit/OperatorEqualNotBool.txt
index 9f10587..8662c16 100644
--- a/dhall/tests/type-errors/unit/OperatorEqualNotBool.txt
+++ b/dhall/tests/type-errors/unit/OperatorEqualNotBool.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: BinOpTypeMismatch
+Type error: error: BinOpTypeMismatch
+ --> <current file>:1:0
+  |
+1 | 1 == 1
+  | ^^^^^^ BinOpTypeMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/OperatorListConcatenateLhsNotList.txt b/dhall/tests/type-errors/unit/OperatorListConcatenateLhsNotList.txt
index 9f10587..8075b99 100644
--- a/dhall/tests/type-errors/unit/OperatorListConcatenateLhsNotList.txt
+++ b/dhall/tests/type-errors/unit/OperatorListConcatenateLhsNotList.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: BinOpTypeMismatch
+Type error: error: BinOpTypeMismatch
+ --> <current file>:1:0
+  |
+1 | 1 # [ True ]
+  | ^^^^^^^^^^^^ BinOpTypeMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/OperatorListConcatenateListsNotMatch.txt b/dhall/tests/type-errors/unit/OperatorListConcatenateListsNotMatch.txt
index 9f10587..9e404f8 100644
--- a/dhall/tests/type-errors/unit/OperatorListConcatenateListsNotMatch.txt
+++ b/dhall/tests/type-errors/unit/OperatorListConcatenateListsNotMatch.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: BinOpTypeMismatch
+Type error: error: BinOpTypeMismatch
+ --> <current file>:1:0
+  |
+1 | [ True ] # [ 1 ]
+  | ^^^^^^^^^^^^^^^^ BinOpTypeMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/OperatorListConcatenateNotListsButMatch.txt b/dhall/tests/type-errors/unit/OperatorListConcatenateNotListsButMatch.txt
index 9f10587..fffc898 100644
--- a/dhall/tests/type-errors/unit/OperatorListConcatenateNotListsButMatch.txt
+++ b/dhall/tests/type-errors/unit/OperatorListConcatenateNotListsButMatch.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: BinOpTypeMismatch
+Type error: error: BinOpTypeMismatch
+ --> <current file>:1:0
+  |
+1 | 1 # 2
+  | ^^^^^ BinOpTypeMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/OperatorListConcatenateRhsNotList.txt b/dhall/tests/type-errors/unit/OperatorListConcatenateRhsNotList.txt
index 9f10587..2ba0b91 100644
--- a/dhall/tests/type-errors/unit/OperatorListConcatenateRhsNotList.txt
+++ b/dhall/tests/type-errors/unit/OperatorListConcatenateRhsNotList.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: BinOpTypeMismatch
+Type error: error: BinOpTypeMismatch
+ --> <current file>:1:0
+  |
+1 | [ True ] # 1
+  | ^^^^^^^^^^^^ BinOpTypeMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/OperatorNotEqualNotBool.txt b/dhall/tests/type-errors/unit/OperatorNotEqualNotBool.txt
index 9f10587..ac04fd4 100644
--- a/dhall/tests/type-errors/unit/OperatorNotEqualNotBool.txt
+++ b/dhall/tests/type-errors/unit/OperatorNotEqualNotBool.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: BinOpTypeMismatch
+Type error: error: BinOpTypeMismatch
+ --> <current file>:1:0
+  |
+1 | 1 != 1
+  | ^^^^^^ BinOpTypeMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/OperatorOrNotBool.txt b/dhall/tests/type-errors/unit/OperatorOrNotBool.txt
index 9f10587..9e1c4fb 100644
--- a/dhall/tests/type-errors/unit/OperatorOrNotBool.txt
+++ b/dhall/tests/type-errors/unit/OperatorOrNotBool.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: BinOpTypeMismatch
+Type error: error: BinOpTypeMismatch
+ --> <current file>:1:0
+  |
+1 | 1 || 1
+  | ^^^^^^ BinOpTypeMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/OperatorPlusNotNatural.txt b/dhall/tests/type-errors/unit/OperatorPlusNotNatural.txt
index 9f10587..97e0df4 100644
--- a/dhall/tests/type-errors/unit/OperatorPlusNotNatural.txt
+++ b/dhall/tests/type-errors/unit/OperatorPlusNotNatural.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: BinOpTypeMismatch
+Type error: error: BinOpTypeMismatch
+ --> <current file>:1:0
+  |
+1 | True + True
+  | ^^^^^^^^^^^ BinOpTypeMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/OperatorTextConcatenateLhsNotText.txt b/dhall/tests/type-errors/unit/OperatorTextConcatenateLhsNotText.txt
index 9f10587..679d991 100644
--- a/dhall/tests/type-errors/unit/OperatorTextConcatenateLhsNotText.txt
+++ b/dhall/tests/type-errors/unit/OperatorTextConcatenateLhsNotText.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: BinOpTypeMismatch
+Type error: error: BinOpTypeMismatch
+ --> <current file>:1:0
+  |
+1 | 1 ++ ""
+  | ^^^^^^^ BinOpTypeMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/OperatorTextConcatenateRhsNotText.txt b/dhall/tests/type-errors/unit/OperatorTextConcatenateRhsNotText.txt
index 9f10587..85611f7 100644
--- a/dhall/tests/type-errors/unit/OperatorTextConcatenateRhsNotText.txt
+++ b/dhall/tests/type-errors/unit/OperatorTextConcatenateRhsNotText.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: BinOpTypeMismatch
+Type error: error: BinOpTypeMismatch
+ --> <current file>:1:0
+  |
+1 | "" ++ 1
+  | ^^^^^^^ BinOpTypeMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/OperatorTimesNotNatural.txt b/dhall/tests/type-errors/unit/OperatorTimesNotNatural.txt
index 9f10587..d688ed6 100644
--- a/dhall/tests/type-errors/unit/OperatorTimesNotNatural.txt
+++ b/dhall/tests/type-errors/unit/OperatorTimesNotNatural.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: BinOpTypeMismatch
+Type error: error: BinOpTypeMismatch
+ --> <current file>:1:0
+  |
+1 | True * True
+  | ^^^^^^^^^^^ BinOpTypeMismatch
+  |
diff --git a/dhall/tests/type-errors/unit/OptionalDeprecatedSyntaxAbsent.txt b/dhall/tests/type-errors/unit/OptionalDeprecatedSyntaxAbsent.txt
index 3937453..bfb36ae 100644
--- a/dhall/tests/type-errors/unit/OptionalDeprecatedSyntaxAbsent.txt
+++ b/dhall/tests/type-errors/unit/OptionalDeprecatedSyntaxAbsent.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: InvalidListType
+Type error: error: InvalidListType
+ --> <current file>:1:0
+  |
+1 | [] : Optional Bool
+  | ^^^^^^^^^^^^^^^^^^ InvalidListType
+  |
diff --git a/dhall/tests/type-errors/unit/OptionalDeprecatedSyntaxPresent.txt b/dhall/tests/type-errors/unit/OptionalDeprecatedSyntaxPresent.txt
index 91d7fb0..5332fcb 100644
--- a/dhall/tests/type-errors/unit/OptionalDeprecatedSyntaxPresent.txt
+++ b/dhall/tests/type-errors/unit/OptionalDeprecatedSyntaxPresent.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: annot mismatch: ([1] : List Natural) : Optional Natural
+Type error: error: annot mismatch: ([1] : List Natural) : Optional Natural
+ --> <current file>:1:0
+  |
+1 | [ 1 ] : Optional Natural
+  | ^^^^^^^^^^^^^^^^^^^^^^^^ annot mismatch: ([1] : List Natural) : Optional Natural
+  |
diff --git a/dhall/tests/type-errors/unit/RecordLitDuplicateFields.txt b/dhall/tests/type-errors/unit/RecordLitDuplicateFields.txt
index 4fc4a50..608c6a0 100644
--- a/dhall/tests/type-errors/unit/RecordLitDuplicateFields.txt
+++ b/dhall/tests/type-errors/unit/RecordLitDuplicateFields.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: RecordTypeDuplicateField
+Type error: error: RecordTypeDuplicateField
+ --> <current file>:1:0
+  |
+1 | { x = 0, x = 0 }
+  | ^^^^^^^^^^^^^^^^ RecordTypeDuplicateField
+  |
diff --git a/dhall/tests/type-errors/unit/RecordProjectionDuplicateFields.txt b/dhall/tests/type-errors/unit/RecordProjectionDuplicateFields.txt
index 0d2e83e..5c6520b 100644
--- a/dhall/tests/type-errors/unit/RecordProjectionDuplicateFields.txt
+++ b/dhall/tests/type-errors/unit/RecordProjectionDuplicateFields.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: ProjectionDuplicateField
+Type error: error: ProjectionDuplicateField
+ --> <current file>:1:0
+  |
+1 | { x = 1 }.{ x, x }
+  | ^^^^^^^^^^^^^^^^^^ ProjectionDuplicateField
+  |
diff --git a/dhall/tests/type-errors/unit/RecordProjectionEmpty.txt b/dhall/tests/type-errors/unit/RecordProjectionEmpty.txt
index ddbe5e4..39f263b 100644
--- a/dhall/tests/type-errors/unit/RecordProjectionEmpty.txt
+++ b/dhall/tests/type-errors/unit/RecordProjectionEmpty.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: ProjectionMissingEntry
+Type error: error: ProjectionMissingEntry
+ --> <current file>:1:0
+  |
+1 | {=}.{ x }
+  | ^^^^^^^^^ ProjectionMissingEntry
+  |
diff --git a/dhall/tests/type-errors/unit/RecordProjectionNotPresent.txt b/dhall/tests/type-errors/unit/RecordProjectionNotPresent.txt
index ddbe5e4..032f7a0 100644
--- a/dhall/tests/type-errors/unit/RecordProjectionNotPresent.txt
+++ b/dhall/tests/type-errors/unit/RecordProjectionNotPresent.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: ProjectionMissingEntry
+Type error: error: ProjectionMissingEntry
+ --> <current file>:1:0
+  |
+1 | { y = {=} }.{ x }
+  | ^^^^^^^^^^^^^^^^^ ProjectionMissingEntry
+  |
diff --git a/dhall/tests/type-errors/unit/RecordProjectionNotRecord.txt b/dhall/tests/type-errors/unit/RecordProjectionNotRecord.txt
index cb4b52f..5ed6ffd 100644
--- a/dhall/tests/type-errors/unit/RecordProjectionNotRecord.txt
+++ b/dhall/tests/type-errors/unit/RecordProjectionNotRecord.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: ProjectionMustBeRecord
+Type error: error: ProjectionMustBeRecord
+ --> <current file>:1:0
+  |
+1 | True.{ x }
+  | ^^^^^^^^^^ ProjectionMustBeRecord
+  |
diff --git a/dhall/tests/type-errors/unit/RecordSelectionEmpty.txt b/dhall/tests/type-errors/unit/RecordSelectionEmpty.txt
index ea48374..5b3b7f8 100644
--- a/dhall/tests/type-errors/unit/RecordSelectionEmpty.txt
+++ b/dhall/tests/type-errors/unit/RecordSelectionEmpty.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: MissingRecordField
+Type error: error: MissingRecordField
+ --> <current file>:1:0
+  |
+1 | {=}.x
+  | ^^^^^ MissingRecordField
+  |
diff --git a/dhall/tests/type-errors/unit/RecordSelectionNotPresent.txt b/dhall/tests/type-errors/unit/RecordSelectionNotPresent.txt
index ea48374..d435ca0 100644
--- a/dhall/tests/type-errors/unit/RecordSelectionNotPresent.txt
+++ b/dhall/tests/type-errors/unit/RecordSelectionNotPresent.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: MissingRecordField
+Type error: error: MissingRecordField
+ --> <current file>:1:0
+  |
+1 | { y = {=} }.x
+  | ^^^^^^^^^^^^^ MissingRecordField
+  |
diff --git a/dhall/tests/type-errors/unit/RecordSelectionNotRecord.txt b/dhall/tests/type-errors/unit/RecordSelectionNotRecord.txt
index 35d604f..3f9b7ed 100644
--- a/dhall/tests/type-errors/unit/RecordSelectionNotRecord.txt
+++ b/dhall/tests/type-errors/unit/RecordSelectionNotRecord.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: NotARecord
+Type error: error: NotARecord
+ --> <current file>:1:0
+  |
+1 | True.x
+  | ^^^^^^ NotARecord
+  |
diff --git a/dhall/tests/type-errors/unit/RecordSelectionTypeNotUnionType.txt b/dhall/tests/type-errors/unit/RecordSelectionTypeNotUnionType.txt
index 35d604f..cca28b8 100644
--- a/dhall/tests/type-errors/unit/RecordSelectionTypeNotUnionType.txt
+++ b/dhall/tests/type-errors/unit/RecordSelectionTypeNotUnionType.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: NotARecord
+Type error: error: NotARecord
+ --> <current file>:1:0
+  |
+1 | Bool.x
+  | ^^^^^^ NotARecord
+  |
diff --git a/dhall/tests/type-errors/unit/RecordTypeDuplicateFields.txt b/dhall/tests/type-errors/unit/RecordTypeDuplicateFields.txt
index 4fc4a50..145a59b 100644
--- a/dhall/tests/type-errors/unit/RecordTypeDuplicateFields.txt
+++ b/dhall/tests/type-errors/unit/RecordTypeDuplicateFields.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: RecordTypeDuplicateField
+Type error: error: RecordTypeDuplicateField
+ --> <current file>:1:0
+  |
+1 | { x: Natural, x: Natural }
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^ RecordTypeDuplicateField
+  |
diff --git a/dhall/tests/type-errors/unit/RecordTypeValueMember.txt b/dhall/tests/type-errors/unit/RecordTypeValueMember.txt
index fd4de70..04488ad 100644
--- a/dhall/tests/type-errors/unit/RecordTypeValueMember.txt
+++ b/dhall/tests/type-errors/unit/RecordTypeValueMember.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: InvalidFieldType
+Type error: error: InvalidFieldType
+ --> <current file>:1:0
+  |
+1 | { x : True }
+  | ^^^^^^^^^^^^ InvalidFieldType
+  |
diff --git a/dhall/tests/type-errors/unit/RecursiveRecordMergeLhsNotRecord.txt b/dhall/tests/type-errors/unit/RecursiveRecordMergeLhsNotRecord.txt
index 7fd03d3..f74e839 100644
--- a/dhall/tests/type-errors/unit/RecursiveRecordMergeLhsNotRecord.txt
+++ b/dhall/tests/type-errors/unit/RecursiveRecordMergeLhsNotRecord.txt
@@ -1 +1 @@
-Type error: Unhandled error: RecordTypeMergeRequiresRecordType
+Type error: error: RecordTypeMergeRequiresRecordType
diff --git a/dhall/tests/type-errors/unit/RecursiveRecordMergeOverlapping.txt b/dhall/tests/type-errors/unit/RecursiveRecordMergeOverlapping.txt
index 7fd03d3..f74e839 100644
--- a/dhall/tests/type-errors/unit/RecursiveRecordMergeOverlapping.txt
+++ b/dhall/tests/type-errors/unit/RecursiveRecordMergeOverlapping.txt
@@ -1 +1 @@
-Type error: Unhandled error: RecordTypeMergeRequiresRecordType
+Type error: error: RecordTypeMergeRequiresRecordType
diff --git a/dhall/tests/type-errors/unit/RecursiveRecordMergeRhsNotRecord.txt b/dhall/tests/type-errors/unit/RecursiveRecordMergeRhsNotRecord.txt
index 7fd03d3..f74e839 100644
--- a/dhall/tests/type-errors/unit/RecursiveRecordMergeRhsNotRecord.txt
+++ b/dhall/tests/type-errors/unit/RecursiveRecordMergeRhsNotRecord.txt
@@ -1 +1 @@
-Type error: Unhandled error: RecordTypeMergeRequiresRecordType
+Type error: error: RecordTypeMergeRequiresRecordType
diff --git a/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeLhsNotRecordType.txt b/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeLhsNotRecordType.txt
index 7fd03d3..b35e64b 100644
--- a/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeLhsNotRecordType.txt
+++ b/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeLhsNotRecordType.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: RecordTypeMergeRequiresRecordType
+Type error: error: RecordTypeMergeRequiresRecordType
+ --> <current file>:1:0
+  |
+1 | Bool ⩓ {}
+  | ^^^^^^^^^ RecordTypeMergeRequiresRecordType
+  |
diff --git a/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeOverlapping.txt b/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeOverlapping.txt
index 7fd03d3..f74e839 100644
--- a/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeOverlapping.txt
+++ b/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeOverlapping.txt
@@ -1 +1 @@
-Type error: Unhandled error: RecordTypeMergeRequiresRecordType
+Type error: error: RecordTypeMergeRequiresRecordType
diff --git a/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeRhsNotRecordType.txt b/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeRhsNotRecordType.txt
index 7fd03d3..0200f97 100644
--- a/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeRhsNotRecordType.txt
+++ b/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeRhsNotRecordType.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: RecordTypeMergeRequiresRecordType
+Type error: error: RecordTypeMergeRequiresRecordType
+ --> <current file>:1:0
+  |
+1 | {} ⩓ Bool
+  | ^^^^^^^^^ RecordTypeMergeRequiresRecordType
+  |
diff --git a/dhall/tests/type-errors/unit/RightBiasedRecordMergeLhsNotRecord.txt b/dhall/tests/type-errors/unit/RightBiasedRecordMergeLhsNotRecord.txt
index 42600a4..3b158ce 100644
--- a/dhall/tests/type-errors/unit/RightBiasedRecordMergeLhsNotRecord.txt
+++ b/dhall/tests/type-errors/unit/RightBiasedRecordMergeLhsNotRecord.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: MustCombineRecord
+Type error: error: MustCombineRecord
+ --> <current file>:1:0
+  |
+1 | True ⫽ {=}
+  | ^^^^^^^^^^ MustCombineRecord
+  |
diff --git a/dhall/tests/type-errors/unit/RightBiasedRecordMergeRhsNotRecord.txt b/dhall/tests/type-errors/unit/RightBiasedRecordMergeRhsNotRecord.txt
index 42600a4..4f9cb0d 100644
--- a/dhall/tests/type-errors/unit/RightBiasedRecordMergeRhsNotRecord.txt
+++ b/dhall/tests/type-errors/unit/RightBiasedRecordMergeRhsNotRecord.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: MustCombineRecord
+Type error: error: MustCombineRecord
+ --> <current file>:1:0
+  |
+1 | {=} ⫽ True
+  | ^^^^^^^^^^ MustCombineRecord
+  |
diff --git a/dhall/tests/type-errors/unit/SomeNotType.txt b/dhall/tests/type-errors/unit/SomeNotType.txt
index 63fec72..3584768 100644
--- a/dhall/tests/type-errors/unit/SomeNotType.txt
+++ b/dhall/tests/type-errors/unit/SomeNotType.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: InvalidOptionalType
+Type error: error: InvalidOptionalType
+ --> <current file>:1:0
+  |
+1 | Some Bool
+  | ^^^^^^^^^ InvalidOptionalType
+  |
diff --git a/dhall/tests/type-errors/unit/TextLiteralInterpolateNotText.txt b/dhall/tests/type-errors/unit/TextLiteralInterpolateNotText.txt
index f1a77d9..0132a30 100644
--- a/dhall/tests/type-errors/unit/TextLiteralInterpolateNotText.txt
+++ b/dhall/tests/type-errors/unit/TextLiteralInterpolateNotText.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: InvalidTextInterpolation
+Type error: error: InvalidTextInterpolation
+ --> <current file>:1:0
+  |
+1 | "${1}"
+  | ^^^^^^ InvalidTextInterpolation
+  |
diff --git a/dhall/tests/type-errors/unit/TypeAnnotationWrong.txt b/dhall/tests/type-errors/unit/TypeAnnotationWrong.txt
index 52fc94d..7360e68 100644
--- a/dhall/tests/type-errors/unit/TypeAnnotationWrong.txt
+++ b/dhall/tests/type-errors/unit/TypeAnnotationWrong.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: annot mismatch: (1 : Natural) : Bool
+Type error: error: annot mismatch: (1 : Natural) : Bool
+ --> <current file>:1:0
+  |
+1 | 1 : Bool
+  | ^^^^^^^^ annot mismatch: (1 : Natural) : Bool
+  |
diff --git a/dhall/tests/type-errors/unit/UnionConstructorFieldNotPresent.txt b/dhall/tests/type-errors/unit/UnionConstructorFieldNotPresent.txt
index f88cb57..41d283d 100644
--- a/dhall/tests/type-errors/unit/UnionConstructorFieldNotPresent.txt
+++ b/dhall/tests/type-errors/unit/UnionConstructorFieldNotPresent.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: MissingUnionField
+Type error: error: MissingUnionField
+ --> <current file>:1:0
+  |
+1 | < x : Bool >.y
+  | ^^^^^^^^^^^^^^ MissingUnionField
+  |
diff --git a/dhall/tests/type-errors/unit/UnionDeprecatedConstructorsKeyword.txt b/dhall/tests/type-errors/unit/UnionDeprecatedConstructorsKeyword.txt
index a234f9f..91fb96d 100644
--- a/dhall/tests/type-errors/unit/UnionDeprecatedConstructorsKeyword.txt
+++ b/dhall/tests/type-errors/unit/UnionDeprecatedConstructorsKeyword.txt
@@ -1,4 +1,4 @@
-Type error: Unhandled error: error: unbound variable `constructors`
+Type error: error: unbound variable `constructors`
  --> <current file>:1:0
   |
 1 | constructors < Left : Natural | Right : Bool >
diff --git a/dhall/tests/type-errors/unit/UnionTypeDuplicateVariants1.txt b/dhall/tests/type-errors/unit/UnionTypeDuplicateVariants1.txt
index 27c6cbe..7372641 100644
--- a/dhall/tests/type-errors/unit/UnionTypeDuplicateVariants1.txt
+++ b/dhall/tests/type-errors/unit/UnionTypeDuplicateVariants1.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: UnionTypeDuplicateField
+Type error: error: UnionTypeDuplicateField
+ --> <current file>:1:0
+  |
+1 | <x | x>
+  | ^^^^^^^ UnionTypeDuplicateField
+  |
diff --git a/dhall/tests/type-errors/unit/UnionTypeDuplicateVariants2.txt b/dhall/tests/type-errors/unit/UnionTypeDuplicateVariants2.txt
index 27c6cbe..07042c2 100644
--- a/dhall/tests/type-errors/unit/UnionTypeDuplicateVariants2.txt
+++ b/dhall/tests/type-errors/unit/UnionTypeDuplicateVariants2.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: UnionTypeDuplicateField
+Type error: error: UnionTypeDuplicateField
+ --> <current file>:1:0
+  |
+1 | <x | x: Natural>
+  | ^^^^^^^^^^^^^^^^ UnionTypeDuplicateField
+  |
diff --git a/dhall/tests/type-errors/unit/UnionTypeMixedKinds.txt b/dhall/tests/type-errors/unit/UnionTypeMixedKinds.txt
index fd4de70..00e24b3 100644
--- a/dhall/tests/type-errors/unit/UnionTypeMixedKinds.txt
+++ b/dhall/tests/type-errors/unit/UnionTypeMixedKinds.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: InvalidFieldType
+Type error: error: InvalidFieldType
+ --> <current file>:1:0
+  |
+1 | < x : Bool | y : Type >
+  | ^^^^^^^^^^^^^^^^^^^^^^^ InvalidFieldType
+  |
diff --git a/dhall/tests/type-errors/unit/UnionTypeMixedKinds2.txt b/dhall/tests/type-errors/unit/UnionTypeMixedKinds2.txt
index fd4de70..924b1e1 100644
--- a/dhall/tests/type-errors/unit/UnionTypeMixedKinds2.txt
+++ b/dhall/tests/type-errors/unit/UnionTypeMixedKinds2.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: InvalidFieldType
+Type error: error: InvalidFieldType
+ --> <current file>:1:0
+  |
+1 | < x : Kind | y : Type >
+  | ^^^^^^^^^^^^^^^^^^^^^^^ InvalidFieldType
+  |
diff --git a/dhall/tests/type-errors/unit/UnionTypeMixedKinds3.txt b/dhall/tests/type-errors/unit/UnionTypeMixedKinds3.txt
index fd4de70..1113a0d 100644
--- a/dhall/tests/type-errors/unit/UnionTypeMixedKinds3.txt
+++ b/dhall/tests/type-errors/unit/UnionTypeMixedKinds3.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: InvalidFieldType
+Type error: error: InvalidFieldType
+ --> <current file>:1:0
+  |
+1 | < x : Kind | y : Bool >
+  | ^^^^^^^^^^^^^^^^^^^^^^^ InvalidFieldType
+  |
diff --git a/dhall/tests/type-errors/unit/UnionTypeNotType.txt b/dhall/tests/type-errors/unit/UnionTypeNotType.txt
index fd4de70..b2c06e0 100644
--- a/dhall/tests/type-errors/unit/UnionTypeNotType.txt
+++ b/dhall/tests/type-errors/unit/UnionTypeNotType.txt
@@ -1 +1,6 @@
-Type error: Unhandled error: InvalidFieldType
+Type error: error: InvalidFieldType
+ --> <current file>:1:0
+  |
+1 | < x : True >
+  | ^^^^^^^^^^^^ InvalidFieldType
+  |
diff --git a/dhall/tests/type-errors/unit/VariableFree.txt b/dhall/tests/type-errors/unit/VariableFree.txt
index 52baa7f..db78e15 100644
--- a/dhall/tests/type-errors/unit/VariableFree.txt
+++ b/dhall/tests/type-errors/unit/VariableFree.txt
@@ -1,4 +1,4 @@
-Type error: Unhandled error: error: unbound variable `x`
+Type error: error: unbound variable `x`
  --> <current file>:1:0
   |
 1 | x