diff --git a/lang/test/org/partiql/lang/eval/ErrorSignalerTests.kt b/lang/test/org/partiql/lang/eval/ErrorSignalerTests.kt
index f3de26e967..3c509ddb91 100644
--- a/lang/test/org/partiql/lang/eval/ErrorSignalerTests.kt
+++ b/lang/test/org/partiql/lang/eval/ErrorSignalerTests.kt
@@ -37,8 +37,8 @@ class ErrorSignalerTests {
             ex
         }
         assertEquals(ex.errorCode, ErrorCode.EVALUATOR_CAST_FAILED)
-        assertEquals(ex.errorContext!![Property.LINE_NUMBER]!!.longValue(), 4L)
-        assertEquals(ex.errorContext!![Property.COLUMN_NUMBER]!!.longValue(), 2L)
+        assertEquals(ex.errorContext[Property.LINE_NUMBER]!!.longValue(), 4L)
+        assertEquals(ex.errorContext[Property.COLUMN_NUMBER]!!.longValue(), 2L)
     }
 
     private fun runTest(ctx1: ErrorSignaler, value: Int): ExprValue =
diff --git a/lang/test/org/partiql/lang/eval/TypingModeTests.kt b/lang/test/org/partiql/lang/eval/TypingModeTests.kt
index 28adb263d7..a771b54e5f 100644
--- a/lang/test/org/partiql/lang/eval/TypingModeTests.kt
+++ b/lang/test/org/partiql/lang/eval/TypingModeTests.kt
@@ -64,12 +64,12 @@ class TypingModeTests : EvaluatorTestBase() {
                 assertEquals(
                     "line number",
                     tc.expectedLegacyError.lineNum.toLong(),
-                    ex.errorContext?.get(Property.LINE_NUMBER)?.longValue()
+                    ex.errorContext[Property.LINE_NUMBER]?.longValue()
                 )
                 assertEquals(
                     "column number",
                     tc.expectedLegacyError.charOffset.toLong(),
-                    ex.errorContext?.get(Property.COLUMN_NUMBER)?.longValue()
+                    ex.errorContext[Property.COLUMN_NUMBER]?.longValue()
                 )
             }
         )