2 files changed, 10 insertions, 9 deletions
diff --git a/chapter17/src/test/java/com/seaofnodes/simple/Chapter10Test.java b/chapter17/src/test/java/com/seaofnodes/simple/Chapter10Test.java
index 089649bf..e3d8b177 100644
--- a/chapter17/src/test/java/com/seaofnodes/simple/Chapter10Test.java
+++ b/chapter17/src/test/java/com/seaofnodes/simple/Chapter10Test.java
@@ -48,6 +48,7 @@ public class Chapter10Test {
     public void testNullGuardErrors() {
         for( String body : new String[] {
             "return p.x;",
+            "if (p == null) return p.x; return -1;",
             "if (!!points) return p.x; return -1;",
             "if (!!p) { int x = p.x; } return p.x;"
         } ) {
@@ -55,7 +56,10 @@ public class Chapter10Test {
                 new Parser(NULLABLE_POINT_SOURCE+body).parse().iterate();
                 fail(body);
             } catch( RuntimeException e ) {
-                assertEquals(body,"Might be null accessing 'x'",e.getMessage());
+                // Known null is rejected during parsing in these chapters.
+                String expected = body.startsWith("if (p == null)")
+                    ? "Accessing unknown field 'x' from 'null'" : "Might be null accessing 'x'";
+                assertEquals(body,expected,e.getMessage());
             }
         }
     }
diff --git a/chapter17/src/test/java/com/seaofnodes/simple/Chapter16Test.java b/chapter17/src/test/java/com/seaofnodes/simple/Chapter16Test.java
index 5450824a..36510737 100644
--- a/chapter17/src/test/java/com/seaofnodes/simple/Chapter16Test.java
+++ b/chapter17/src/test/java/com/seaofnodes/simple/Chapter16Test.java
@@ -144,14 +144,11 @@ return p;
 
     @Test
     public void testStructFinal3() {
-        Parser parser = new Parser("""
-struct Point { var x; var y; };
-Point p = new Point;
-p.x++;
-return p;
-""");
-        try { parser.parse().iterate(); fail(); }
-        catch( Exception e ) { assertEquals("'Point' is not fully initialized, field 'x' needs to be set in a constructor",e.getMessage()); }
+        for( String fields : new String[] { "var x; var y;", "int[] x;", "int[] !x;" } ) {
+            String src = "struct Point { "+fields+" }; Point p = new Point; p.x++; return p;";
+            try { new Parser(src).parse().iterate(); fail(fields); }
+            catch( Exception e ) { assertEquals("'Point' is not fully initialized, field 'x' needs to be set in a constructor",e.getMessage()); }
+        }
     }
 
     @Test