### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core.tests.compiler
Index: src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java,v
retrieving revision 1.52
diff -u -r1.52 NullReferenceTest.java
--- src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java	26 Feb 2007 08:47:59 -0000	1.52
+++ src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java	27 Feb 2007 09:00:05 -0000
@@ -72,7 +72,7 @@
 	    "1. ERROR in X.java (at line 4)\n" + 
 	    "	o.toString();\n" + 
 	    "	^\n" + 
-	    "The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 	    "----------\n");
 }
   
@@ -114,7 +114,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -133,7 +133,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -172,7 +172,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	if (o != null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
  
@@ -192,7 +192,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	x.m.toString();\n" + 
 		"	^\n" + 
-		"The variable x can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable x can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -212,7 +212,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	System.out.println(x.m);\n" + 
 		"	                   ^\n" + 
-		"The variable x can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable x can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -578,7 +578,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -613,7 +613,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	x.m = new Object();\n" + 
 		"	^\n" + 
-		"The variable x can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable x can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -632,7 +632,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -651,7 +651,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -684,7 +684,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -749,7 +749,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	if (o == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -769,7 +769,7 @@
 			"1. ERROR in X.java (at line 4)\n" + 
 			"	i += 1;\n" + 
 			"	^\n" + 
-			"The variable i can only be null; it was either set to null or checked for null when last used\n" + 
+			"Null pointer access: The variable i can only be null at this location\n" +  
 			"----------\n");
 	}
 }
@@ -791,7 +791,7 @@
 			"1. ERROR in X.java (at line 4)\n" + 
 			"	i++;\n" + 
 			"	^\n" + 
-			"The variable i can only be null; it was either set to null or checked for null when last used\n" + 
+			"Null pointer access: The variable i can only be null at this location\n" +  
 			"----------\n");
 	}
 }
@@ -812,7 +812,7 @@
 			"1. ERROR in X.java (at line 4)\n" + 
 			"	if (i == null) {};\n" + 
 			"	    ^\n" + 
-			"The variable i cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+			"Redundant null check: The variable i cannot be null at this location\n" +  
 			"----------\n");
 	}
 }
@@ -833,7 +833,7 @@
 			"1. ERROR in X.java (at line 4)\n" + 
 			"	System.out.println(i + 4);\n" + 
 			"	                   ^\n" + 
-			"The variable i can only be null; it was either set to null or checked for null when last used\n" + 
+			"Null pointer access: The variable i can only be null at this location\n" + 
 			"----------\n");
 	}
 }
@@ -872,7 +872,7 @@
 			"1. ERROR in X.java (at line 4)\n" + 
 			"	if (i == null) {}\n" + 
 			"	    ^\n" + 
-			"The variable i cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+			"Redundant null check: The variable i cannot be null at this location\n" + 
 			"----------\n");
 	}
 }
@@ -908,7 +908,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	args[0].toString();\n" + 
 		"	^^^^\n" + 
-		"The variable args can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable args can only be null at this location\n" +  
 		"----------\n");
 }
 
@@ -955,7 +955,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	if (o == null) {};\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" +  
 		"----------\n");
 } 
 
@@ -978,7 +978,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	if (o == null) {/* empty */}\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n");
 }   
 
@@ -1019,7 +1019,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	if (o == null) {/* empty */}\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }   
 
@@ -1052,7 +1052,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	(o = null).toString();\n" + 
 		"	^^^^^^^^^^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }   
 
@@ -1071,7 +1071,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	if (o == null)  { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" +  
 		"----------\n");
 }  
 
@@ -1107,7 +1107,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	if (c == null) {};\n" + 
 		"	    ^\n" + 
-		"The variable c cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable c cannot be null at this location\n" +  
 		"----------\n");
 }
 
@@ -1124,7 +1124,7 @@
 		"1. ERROR in X.java (at line 3)\n" + 
 		"	if (o1 != null && (o2 = o1) != null) { /* */ }\n" + 
 		"	                  ^^^^^^^^^\n" + 
-		"The variable o2 cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o2 cannot be null at this location\n" +  
 		"----------\n"
 	);
 }
@@ -1142,7 +1142,7 @@
 		"1. ERROR in X.java (at line 3)\n" + 
 		"	while (o1 != null && (o2 = o1) != null) { /* */ }\n" + 
 		"	                     ^^^^^^^^^\n" + 
-		"The variable o2 cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o2 cannot be null at this location\n" +  
 		"----------\n"
 	);
 }
@@ -1164,12 +1164,12 @@
 		"1. ERROR in X.java (at line 3)\n" + 
 		"	if (o == null || o == null) {\n" + 
 		"	                 ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 6)\n" + 
 		"	if (o == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -1190,12 +1190,12 @@
 		"1. ERROR in X.java (at line 3)\n" + 
 		"	if (o == null && o == null) {\n" + 
 		"	                 ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 6)\n" + 
 		"	if (o == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -1215,7 +1215,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	|| (i1.byteValue() == i2.byteValue());\n" + 
 		"	    ^^\n" + 
-		"The variable i1 may be null\n" + 
+		"Potential null pointer access: The variable i1 may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -1235,12 +1235,12 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	|| (i1.byteValue() == i2.byteValue());\n" + 
 		"	    ^^\n" + 
-		"The variable i1 may be null\n" + 
+		"Potential null pointer access: The variable i1 may be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 4)\n" + 
 		"	|| (i1.byteValue() == i2.byteValue());\n" + 
 		"	                      ^^\n" + 
-		"The variable i2 may be null\n" + 
+		"Potential null pointer access: The variable i2 may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -1297,7 +1297,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	if (o instanceof X) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"instanceof always yields false: The variable o can only be null at this location\n" +  
 		"----------\n");
 }
 
@@ -1317,7 +1317,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	if (x == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable x cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable x cannot be null at this location\n" +  
 		"----------\n");
 }
 
@@ -1356,7 +1356,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	|| x == null) {\n" + 
 		"	   ^\n" + 
-		"The variable x cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable x cannot be null at this location\n" +  
 		"----------\n");
 }
 
@@ -1408,7 +1408,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	return s1.toString();\n" + 
 		"	       ^^\n" + 
-		"The variable s1 may be null\n" + 
+		"Potential null pointer access: The variable s1 may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -1528,7 +1528,7 @@
 		"1. ERROR in X.java (at line 13)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" +  
 		"----------\n");
 }
 
@@ -1548,7 +1548,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	if (o != null) {\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" +  
 		"----------\n");
 }
 
@@ -1570,7 +1570,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	if (o != null) {\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" +  
 		"----------\n");
 }
 
@@ -1592,7 +1592,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	if (o != null) {\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" +  
 		"----------\n");
 }
 
@@ -1612,7 +1612,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" +  
 		"----------\n");
 }
 
@@ -1633,7 +1633,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -1655,7 +1655,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	if (o == null) {\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" +  
 		"----------\n");
 }
 
@@ -1699,7 +1699,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }   
 
@@ -1724,7 +1724,7 @@
 		"1. ERROR in X.java (at line 10)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }   
 
@@ -1750,12 +1750,12 @@
 		"1. ERROR in X.java (at line 8)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 11)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }   
 
@@ -1792,12 +1792,12 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	if (o == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 7)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
  
@@ -1819,7 +1819,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	if (o == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -1840,7 +1840,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	if (o == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -1861,7 +1861,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -1881,7 +1881,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -1953,7 +1953,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	if (o == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -1990,7 +1990,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	if (o == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2069,7 +2069,7 @@
 		"1. ERROR in X.java (at line 20)\n" + 
 		"	s.toString();\n" + 
 		"	^\n" + 
-		"The variable s may be null\n" + 
+		"Potential null pointer access: The variable s may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2093,7 +2093,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	s1.toString();\n" + 
 		"	^^\n" + 
-		"The variable s1 may be null\n" + 
+		"Potential null pointer access: The variable s1 may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2119,7 +2119,7 @@
 		"1. ERROR in X.java (at line 9)\n" + 
 		"	s2.toString();\n" + 
 		"	^^\n" + 
-		"The variable s2 may be null\n" + 
+		"Potential null pointer access: The variable s2 may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2143,7 +2143,7 @@
 		"1. ERROR in X.java (at line 9)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2164,7 +2164,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2222,7 +2222,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	if (o != null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2246,7 +2246,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	if (o != null) {\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2273,12 +2273,12 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	if (o != null) {\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 8)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2304,7 +2304,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	if (o != null) {\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2332,12 +2332,12 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	if (o != null) {\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 8)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2433,7 +2433,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2458,7 +2458,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2480,7 +2480,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	o1.toString();\n" + 
 		"	^^\n" + 
-		"The variable o1 may be null\n" + 
+		"Potential null pointer access: The variable o1 may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2502,7 +2502,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	o1.toString();\n" + 
 		"	^^\n" + 
-		"The variable o1 may be null\n" + 
+		"Potential null pointer access: The variable o1 may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2522,7 +2522,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	while (o.toString() != null) {/* */}\n" + 
 		"	       ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2542,7 +2542,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	while (o != null) {/* */}\n" + 
 		"	       ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2604,7 +2604,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2624,7 +2624,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	while (dummy || o != null) { /* */ }\n" + 
 		"	                ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2647,7 +2647,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2702,7 +2702,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2775,7 +2775,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2814,7 +2814,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2858,7 +2858,7 @@
 		"1. ERROR in X.java (at line 8)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2879,7 +2879,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2923,7 +2923,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	o.toString();      o = null;\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2948,7 +2948,7 @@
 		"1. ERROR in X.java (at line 10)\n" + 
 		"	if (o == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -2990,7 +2990,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	if (o == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -3014,7 +3014,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	if (o == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -3060,7 +3060,7 @@
 		"1. ERROR in X.java (at line 8)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -3081,7 +3081,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	if (o == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -3105,7 +3105,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	if (o == null) {\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -3239,7 +3239,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	x.toString();\n" + 
 		"	^\n" + 
-		"The variable x can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable x can only be null at this location\n" +  
 		"----------\n");
 }
 
@@ -3347,7 +3347,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	if (o != null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 } 
 
@@ -3384,7 +3384,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	if (o != null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -3408,7 +3408,7 @@
 		"1. ERROR in X.java (at line 9)\n" + 
 		"	if (o != null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -3430,7 +3430,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 } 
 
@@ -3511,7 +3511,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	if (o != null) {\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n");
 } 
 
@@ -3532,7 +3532,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	if (o != null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -3590,7 +3590,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	if (o != null) {\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n");
 } 
 
@@ -3635,7 +3635,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	if (o != null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 } 
 
@@ -3660,7 +3660,7 @@
 		"1. ERROR in X.java (at line 9)\n" + 
 		"	if (o != null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 } 
 
@@ -3685,7 +3685,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	if (o == null) {\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n"
 	);
 }
@@ -3759,7 +3759,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	if (o != null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 } 
 
@@ -3877,7 +3877,7 @@
 		"1. ERROR in X.java (at line 8)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n" // because finally assigns to null 
 	);
 }
@@ -3920,7 +3920,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	x = null;\n" + 
 		"	^\n" + 
-		"The variable x can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant assignment: The variable x can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -3942,7 +3942,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	if (x != null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable x can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable x can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -3988,7 +3988,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	if (o == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -4012,7 +4012,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	if (o == null) {\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -4036,7 +4036,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -4063,7 +4063,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	o2.toString();\n" + 
 		"	^^\n" + 
-		"The variable o2 can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o2 can only be null at this location\n" +  
 		"----------\n");
 }
 
@@ -4133,7 +4133,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	x.toString();\n" + 
 		"	^\n" + 
-		"The variable x may be null\n" + 
+		"Potential null pointer access: The variable x may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -4337,7 +4337,7 @@
 		"1. ERROR in X.java (at line 28)\n" + 
 		"	x.toString();\n" + 
 		"	^\n" + 
-		"The variable x may be null\n" + 
+		"Potential null pointer access: The variable x may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -4458,7 +4458,7 @@
 		"1. ERROR in X.java (at line 10)\n" + 
 		"	if(t.bar()) {\n" + 
 		"	   ^\n" + 
-		"The variable t can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable t can only be null at this location\n" +  
 		"----------\n");
 }
 
@@ -4491,7 +4491,7 @@
 		"1. ERROR in X.java (at line 10)\n" + 
 		"	if(t == null ? false : (t == null ? false : t.bar())) {\n" + 
 		"	                        ^\n" + 
-		"The variable t cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable t cannot be null at this location\n" +  
 		"----------\n");
 }
 
@@ -4524,7 +4524,7 @@
 		"1. ERROR in X.java (at line 10)\n" + 
 		"	if(t != null ? false : (t == null ? false : t.bar())) {\n" + 
 		"	                        ^\n" + 
-		"The variable t can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable t can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -4559,7 +4559,7 @@
 		"1. ERROR in X.java (at line 13)\r\n" + 
 		"	o.toString();\r\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -4594,7 +4594,7 @@
 		"1. ERROR in X.java (at line 12)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -4626,7 +4626,7 @@
 		"1. ERROR in X.java (at line 12)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -4651,12 +4651,12 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	if (x != null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable x can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable x can only be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 8)\n" + 
 		"	if (y != null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable y can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable y can only be null at this location\n" +  
 		"----------\n");
 }
 
@@ -4681,12 +4681,12 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 8)\n" + 
 		"	o2.toString();\n" + 
 		"	^^\n" + 
-		"The variable o2 can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o2 can only be null at this location\n" +  
 		"----------\n");
 }
 
@@ -4712,12 +4712,12 @@
 		"1. ERROR in X.java (at line 8)\n" + 
 		"	x.toString();\n" + 
 		"	^\n" + 
-		"The variable x may be null\n" + 
+		"Potential null pointer access: The variable x may be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 9)\n" + 
 		"	y.toString();\n" + 
 		"	^\n" + 
-		"The variable y can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable y can only be null at this location\n" +  
 		"----------\n");
 }
 
@@ -4744,12 +4744,12 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	if (x != null) {\n" + 
 		"	    ^\n" + 
-		"The variable x cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable x cannot be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 10)\n" + 
 		"	y.toString();\n" + 
 		"	^\n" + 
-		"The variable y can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable y can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -4799,7 +4799,7 @@
 		"1. ERROR in X.java (at line 13)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -4859,7 +4859,7 @@
 		"1. ERROR in X.java (at line 15)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -4895,7 +4895,7 @@
 //		"1. ERROR in X.java (at line 10)\n" + 
 //		"	if (o != null) {\n" + 
 //		"	    ^\n" + 
-//		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+//		"Redundant null check: The variable o can only be null at this location\n" + 
 //		"----------\n"
 	);
 }
@@ -4924,7 +4924,7 @@
 		"1. ERROR in X.java (at line 9)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -4952,7 +4952,7 @@
 		"1. ERROR in X.java (at line 9)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -4980,7 +4980,7 @@
 		"1. ERROR in X.java (at line 12)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -5012,8 +5012,8 @@
 		"1. ERROR in X.java (at line 13)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-//		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
-		"The variable o may be null\n" +
+//		"Null pointer access: The variable o can only be null at this location\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" +
 		// conservative flow analysis softens the error
 		"----------\n");
 }
@@ -5048,8 +5048,8 @@
 		"1. ERROR in X.java (at line 12)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-//		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
-		"The variable o may be null\n" +
+//		"Null pointer access: The variable o can only be null at this location\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" +
 		// conservative flow analysis softens the error
 		"----------\n");
 }
@@ -5086,7 +5086,7 @@
 		"1. ERROR in X.java (at line 19)\n" + 
 		"	if (c == null) { // should complain: c can only be null\n" + 
 		"	    ^\n" + 
-		"The variable c can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable c can only be null at this location\n" +  
 		"----------\n");
 }
 
@@ -5113,7 +5113,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -5140,7 +5140,7 @@
 		"1. ERROR in X.java (at line 8)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -5177,7 +5177,7 @@
 		"1. ERROR in X.java (at line 20)\n" + 
 		"	if (ex == null) {\n" + 
 		"	    ^^\n" + 
-		"The variable ex cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable ex cannot be null at this location\n" +  
 		"----------\n");
 }
 
@@ -5271,7 +5271,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	while (o.toString() != null);\n" + 
 		"	       ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -5292,7 +5292,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	while (o != null);\n" + 
 		"	       ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -5315,7 +5315,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	while (o == null);\n" + 
 		"	       ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -5357,7 +5357,7 @@
 		"1. ERROR in X.java (at line 8)\n" + 
 		"	while (dummy || o != null);\n" + 
 		"	                ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -5407,7 +5407,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -5448,7 +5448,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -5491,7 +5491,7 @@
 		"1. ERROR in X.java (at line 9)\n" + 
 		"	if (o != null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -5519,7 +5519,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	if (o == null) {\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n"
 	);
 }
@@ -5567,7 +5567,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	if (o == null) {\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n"
 	);
 }
@@ -5593,7 +5593,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	if (o == null) {\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n"
 	);
 }
@@ -5614,7 +5614,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	for (;o.toString() != null;) {/* */}\n" + 
 		"	      ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -5634,7 +5634,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	for (;o != null;) {/* */}\n" + 
 		"	      ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" +  
 		"----------\n");
 }
 
@@ -5696,7 +5696,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -5730,7 +5730,7 @@
 		"1. ERROR in X.java (at line 3)\n" + 
 		"	for (;o == null; o.toString()) {\n" + 
 		"	                 ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -5748,7 +5748,7 @@
 		"1. ERROR in X.java (at line 3)\n" + 
 		"	for (o.toString(); o == null;) { /* */ }\n" + 
 		"	                   ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -5771,7 +5771,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	for (o.toString(); bar();) {\n" + 
 		"	     ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -5792,7 +5792,7 @@
 			"1. ERROR in X.java (at line 4)\n" + 
 			"	for (Object o : t) {/* */}\n" + 
 			"	                ^\n" + 
-			"The variable t can only be null; it was either set to null or checked for null when last used\n" + 
+			"Null pointer access: The variable t can only be null at this location\n" +  
 			"----------\n");
 	}
 }
@@ -5814,7 +5814,7 @@
 			"1. ERROR in X.java (at line 4)\n" + 
 			"	for (Object o : i) {/* */}\n" + 
 			"	                ^\n" + 
-			"The variable i can only be null; it was either set to null or checked for null when last used\n" + 
+			"Null pointer access: The variable i can only be null at this location\n" +  
 			"----------\n");
 	}
 }
@@ -5872,7 +5872,7 @@
 			"1. ERROR in X.java (at line 8)\n" + 
 			"	flag.toString();\n" + 
 			"	^^^^\n" + 
-			"The variable flag may be null\n" + 
+			"Potential null pointer access: The variable flag may be null at this location\n" + 
 			"----------\n");
 	}
 }
@@ -5895,7 +5895,7 @@
 			"1. ERROR in X.java (at line 6)\n" + 
 			"	flag.toString();\n" + 
 			"	^^^^\n" + 
-			"The variable flag can only be null; it was either set to null or checked for null when last used\n" + 
+			"Null pointer access: The variable flag can only be null at this location\n" +  
 			"----------\n");
 	}
 }
@@ -5919,7 +5919,7 @@
 			"1. ERROR in X.java (at line 7)\n" + 
 			"	flag.toString();\n" + 
 			"	^^^^\n" + 
-			"The variable flag may be null\n" + 
+			"Potential null pointer access: The variable flag may be null at this location\n" + 
 			"----------\n");
 	}
 }
@@ -5940,7 +5940,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	flag.toString();\n" + 
 		"	^^^^\n" + 
-		"The variable flag can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable flag can only be null at this location\n" +  
 		"----------\n");
 }
 
@@ -5992,7 +5992,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	if (o == null) {\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 	
@@ -6037,7 +6037,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	if (o == null) {\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 	
@@ -6207,7 +6207,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	if (o != null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -6231,7 +6231,7 @@
 		"1. ERROR in X.java (at line 9)\n" + 
 		"	if (o != null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -6382,7 +6382,7 @@
 		"1. ERROR in X.java (at line 11)\n" + 
 		"	if (b.booleanValue()) {\n" + 
 		"	    ^\n" + 
-		"The variable b can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable b can only be null at this location\n" +  
 		"----------\n");
 }
 
@@ -6460,7 +6460,7 @@
 		"1. ERROR in X.java (at line 12)\n" + 
 		"	if(o == null) { /* */ }\n" + 
 		"	   ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -6484,7 +6484,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -6510,7 +6510,7 @@
 		"1. ERROR in X.java (at line 9)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -6540,7 +6540,7 @@
 		"1. ERROR in X.java (at line 15)\n" + 
 		"	if(o != null) { /* */ }\n" + 
 		"	   ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -6677,32 +6677,32 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	o/*N N*/.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 10)\n" + 
 		"	o/*NNa*/.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n" + 
 		"3. ERROR in X.java (at line 14)\n" + 
 		"	o/*aNN */.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n" + 
 		"4. ERROR in X.java (at line 18)\n" + 
 		"	o/*NON NULL*/.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n" + 
 		"5. ERROR in X.java (at line 22)\n" + 
 		"	o/*Non-Null*/.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n" + 
 		"6. ERROR in X.java (at line 26)\n" + 
 		"	o/*aNON-NULL */.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -6722,7 +6722,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	o.toString();/*NN*/\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -6741,7 +6741,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	/*NN*/o.toString();\n" + 
 		"	      ^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -6780,7 +6780,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n");
 	}
 }
@@ -6802,7 +6802,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 	}
 }
@@ -6821,17 +6821,17 @@
 				"    if (o2 == null) { };\n" + 		// complain
 				"  }\n" + 
 				"}\n"},
-		"----------\n" + 
-		"1. ERROR in X.java (at line 4)\n" + 
-		"	if (o1 == null) { };\n" + 
-		"	    ^^\n" + 
-		"The variable o1 cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
-		"----------\n" + 
-		"2. ERROR in X.java (at line 5)\n" + 
-		"	if (o2 == null) { };\n" + 
-		"	    ^^\n" + 
-		"The variable o2 can only be null; it was either set to null or checked for null when last used\n" + 
-		"----------\n");
+			"----------\n" + 
+			"1. ERROR in X.java (at line 4)\n" + 
+			"	if (o1 == null) { };\n" + 
+			"	    ^^\n" + 
+			"Redundant null check: The variable o1 cannot be null at this location\n" + 
+			"----------\n" + 
+			"2. ERROR in X.java (at line 5)\n" + 
+			"	if (o2 == null) { };\n" + 
+			"	    ^^\n" + 
+			"Redundant null check: The variable o2 can only be null at this location\n" + 
+			"----------\n");
 	}
 }
 
@@ -6869,7 +6869,7 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	if (o == null) { };\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 	}
 }
@@ -6892,12 +6892,12 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	assert(o != null);\n" + 
 		"	       ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 5)\n" + 
 		"	if (o == null) { };\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 	}
 }
@@ -7058,27 +7058,27 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	if (x != null) { // 1\n" + 
 		"	    ^\n" + 
-		"The variable x cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable x cannot be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 5)\n" + 
 		"	if (x == null) { // 2\n" + 
 		"	    ^\n" + 
-		"The variable x cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable x cannot be null at this location\n" + 
 		"----------\n" + 
 		"3. ERROR in X.java (at line 6)\n" + 
 		"	x.foo(null); // 3\n" + 
 		"	^\n" + 
-		"The variable x can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable x can only be null at this location\n" + 
 		"----------\n" + 
 		"4. ERROR in X.java (at line 9)\n" + 
 		"	} else if (x != null) { // 6\n" + 
 		"	           ^\n" + 
-		"The variable x cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable x cannot be null at this location\n" + 
 		"----------\n" + 
 		"5. ERROR in X.java (at line 12)\n" + 
 		"	x.foo(null); // 8\n" + 
 		"	^\n" + 
-		"The variable x may be null\n" + 
+		"Potential null pointer access: The variable x may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -7182,7 +7182,7 @@
 		"1. ERROR in X.java (at line 22)\n" + 
 		"	if (c == null) {// should complain: c can only be null\n" + 
 		"	    ^\n" + 
-		"The variable c can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable c can only be null at this location\n" +  
 		"----------\n");
 }
 
@@ -7229,7 +7229,7 @@
 		"1. ERROR in X.java (at line 9)\n" + 
 		"	if (other != null) {\n" + 
 		"	    ^^^^^\n" + 
-		"The variable other cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable other cannot be null at this location\n" +  
 		"----------\n");
 }
 
@@ -7256,7 +7256,7 @@
 		"1. ERROR in X.java (at line 6)\n" + 
 		"	if (o == null) {\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n"
 	);
 }
@@ -7280,12 +7280,12 @@
 		"1. ERROR in X.java (at line 4)\n" + 
 		"	if (x == null) {\n" + 
 		"	    ^\n" + 
-		"The variable x cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable x cannot be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 5)\n" + 
 		"	x.foo(this);\n" + 
 		"	^\n" + 
-		"The variable x can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable x can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -7307,7 +7307,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	x.foo(null);\n" + 
 		"	^\n" + 
-		"The variable x may be null\n" + 
+		"Potential null pointer access: The variable x may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -7351,12 +7351,12 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	x = null;\n" + 
 		"	^\n" + 
-		"The variable x can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant assignment: The variable x can only be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 7)\n" + 
 		"	if (x != null) {\n" + 
 		"	    ^\n" + 
-		"The variable x can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable x can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -7380,7 +7380,7 @@
 		"1. ERROR in X.java (at line 8)\n" + 
 		"	x.foo(null);\n" + 
 		"	^\n" + 
-		"The variable x can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable x can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -7405,12 +7405,12 @@
 		"1. ERROR in X.java (at line 6)\r\n" + 
 		"	if (o != null) return;\r\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 7)\r\n" + 
 		"	o = null;\r\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant assignment: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -7528,7 +7528,7 @@
 		"1. ERROR in X.java (at line 13)\n" + 
 		"	if (o == null) return;\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -7561,7 +7561,7 @@
 		"1. ERROR in X.java (at line 13)\n" + 
 		"	if (progressJob == null) {\n" + 
 		"	    ^^^^^^^^^^^\n" + 
-		"The variable progressJob can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable progressJob can only be null at this location\n" +  
 		"----------\n");
 }
 
@@ -7585,7 +7585,7 @@
 		"1. ERROR in X.java (at line 10)\n" + 
 		"	if (o == null) return;\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -7700,7 +7700,7 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	if (a == null) {\n" + 
 		"	    ^\n" + 
-		"The variable a can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable a can only be null at this location\n" +  
 		"----------\n");
 }
 
@@ -7729,12 +7729,12 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	if (a == null) {\n" + 
 		"	    ^\n" + 
-		"The variable a can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable a can only be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 13)\n" + 
 		"	if (a == null) {\n" + 
 		"	    ^\n" + 
-		"The variable a cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable a cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -7755,12 +7755,12 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	while (o1 != null && (o3 = o1) != null) {\n" + 
 		"	       ^^\n" + 
-		"The variable o1 cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o1 cannot be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 5)\n" + 
 		"	while (o1 != null && (o3 = o1) != null) {\n" + 
 		"	                     ^^^^^^^^^\n" + 
-		"The variable o3 cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o3 cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -7784,12 +7784,12 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	}while(a!=null);\n" + 
 		"	       ^\n" + 
-		"The variable a cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable a cannot be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 8)\n" + 
 		"	if(a!=null)\n" + 
 		"	   ^\n" + 
-		"The variable a can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable a can only be null at this location\n" + 
 		"----------\n");
 }
 
@@ -7851,12 +7851,12 @@
 		"1. ERROR in X.java (at line 7)\n" + 
 		"	} while (o != null);\n" + 
 		"	         ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 8)\n" + 
 		"	if (o == null) {\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 // https://bugs.eclipse.org/bugs/show_bug.cgi?id=170704
@@ -7936,17 +7936,17 @@
 		"1. ERROR in X.java (at line 4)\r\n" + 
 		"	if (o != null) {\r\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 8)\r\n" + 
 		"	o.toString();\r\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n" + 
 		"3. ERROR in X.java (at line 9)\r\n" + 
 		"	p.toString();\r\n" + 
 		"	^\n" + 
-		"The variable p may be null\n" + 
+		"Potential null pointer access: The variable p may be null at this location\n" + 
 		"----------\n");
 }
 // https://bugs.eclipse.org/bugs/show_bug.cgi?id=170704
@@ -7975,7 +7975,7 @@
 		"1. ERROR in X.java (at line 8)\r\n" + 
 		"	o.toString();\r\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n",
 		null /* no extra class libraries */, 
 		true /* flush output directory */, 
@@ -8012,12 +8012,12 @@
 		"1. ERROR in X.java (at line 4)\r\n" + 
 		"	if (o != null) {\r\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n" + 
 		"2. WARNING in X.java (at line 8)\r\n" + 
 		"	o.toString();\r\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n",
 		null /* no extra class libraries */, 
 		true /* flush output directory */, 
@@ -8054,12 +8054,12 @@
 		"1. ERROR in X.java (at line 4)\r\n" + 
 		"	if (o != null) {\r\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Redundant null check: The variable o can only be null at this location\n" + 
 		"----------\n" + 
 		"2. ERROR in X.java (at line 9)\r\n" + 
 		"	p.toString();\r\n" + 
 		"	^\n" + 
-		"The variable p may be null\n" + 
+		"Potential null pointer access: The variable p may be null at this location\n" + 
 		"----------\n",
 		null /* no extra class libraries */, 
 		true /* flush output directory */, 
@@ -8098,7 +8098,7 @@
 		"1. ERROR in X.java (at line 9)\r\n" + 
 		"	o.toString();\r\n" + 
 		"	^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"Null pointer access: The variable o can only be null at this location\n" + 
 		"----------\n",
 		null /* no extra class libraries */, 
 		true /* flush output directory */, 
@@ -8128,7 +8128,7 @@
 		"1. ERROR in X.java (at line 5)\n" + 
 		"	if (o instanceof String) {};\n" + 
 		"	    ^\n" + 
-		"The variable o can only be null; it was either set to null or checked for null when last used\n" + 
+		"instanceof always yields false: The variable o can only be null at this location\n" + 
 		"----------\n");
 }
 // https://bugs.eclipse.org/bugs/show_bug.cgi?id=170704
@@ -8310,7 +8310,7 @@
 		"1. ERROR in X.java (at line 18)\n" + 
 		"	if (o65 == null) { /* */ }\n" + 
 		"	    ^^^\n" + 
-		"The variable o65 cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o65 cannot be null at this location\n" +  
 		"----------\n");
 }
 
@@ -8566,7 +8566,7 @@
 		"1. ERROR in X.java (at line 20)\n" + 
 		"	if (o == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -8602,7 +8602,7 @@
 		"1. ERROR in X.java (at line 21)\n" + 
 		"	if (o == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -8641,7 +8641,7 @@
 		"1. ERROR in X.java (at line 24)\n" + 
 		"	if (o == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -8680,7 +8680,7 @@
 		"1. ERROR in X.java (at line 24)\n" + 
 		"	if (o == null) { /* */ }\n" + 
 		"	    ^\n" + 
-		"The variable o cannot be null; it was either set to a non-null value or assumed to be non-null when last used\n" + 
+		"Redundant null check: The variable o cannot be null at this location\n" + 
 		"----------\n");
 }
 
@@ -8710,7 +8710,7 @@
 		"1. ERROR in X.java (at line 15)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -8942,7 +8942,7 @@
 		"2. ERROR in X.java (at line 18)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -8979,7 +8979,7 @@
 		"2. ERROR in X.java (at line 18)\n" + 
 		"	o.toString();\n" + 
 		"	^\n" + 
-		"The variable o may be null\n" + 
+		"Potential null pointer access: The variable o may be null at this location\n" + 
 		"----------\n");
 }
 
@@ -9024,7 +9024,7 @@
 		"2. ERROR in X.java (at line 26)\n" + 
 		"	o1.toString();\n" + 
 		"	^^\n" + 
-		"The variable o1 may be null\n" + 
+		"Potential null pointer access: The variable o1 may be null at this location\n" + 
 		"----------\n");
 }
 }
\ No newline at end of file
#P org.eclipse.jdt.core
Index: compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties,v
retrieving revision 1.217
diff -u -r1.217 messages.properties
--- compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties	26 Feb 2007 08:48:59 -0000	1.217
+++ compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties	27 Feb 2007 09:00:16 -0000
@@ -320,13 +320,13 @@
 ###[obsolete] 394 = The imported type {0} is defined in an inherited type and an enclosing scope
 
 391 = The static import {0} must be a field or member type
-392 = The variable {0} can only be null; it was either set to null or checked for null when last used
+392 = Redundant null check: The variable {0} can only be null at this location
 
 395 = Duplicate modifier for the variable {0}
 396 = Illegal modifier for the variable {0}; only final is permitted
-397 = The variable {0} cannot be null; it was either set to a non-null value or assumed to be non-null when last used
-398 = The variable {0} can only be null; it was either set to null or checked for null when last used
-399 = The variable {0} may be null
+397 = Redundant null check: The variable {0} cannot be null at this location
+398 = Null pointer access: The variable {0} can only be null at this location
+399 = Potential null pointer access: The variable {0} may be null at this location
 	
 400 = The type {3} must implement the inherited abstract method {2}.{0}({1})
 401 = Cannot override the final method from {0}