7 files changed, 34 insertions, 10 deletions
diff --git a/src/core/lombok/Builder.java b/src/core/lombok/Builder.java
index af3c3c06..a16717cc 100644
--- a/src/core/lombok/Builder.java
+++ b/src/core/lombok/Builder.java
@@ -48,7 +48,7 @@ import java.lang.annotation.Target;
  * as the relevant class, unless a method has been annotated, in which case it'll be equal to the
  * return type of that method.
  * <p>
- * Complete documentation is found at <a href="https://projectlombok.org/features/experimental/Builder">the project lombok features page for &#64;Builder</a>.
+ * Complete documentation is found at <a href="https://projectlombok.org/features/Builder">the project lombok features page for &#64;Builder</a>.
  * <br>
  * <p>
  * Before:
diff --git a/src/core/lombok/core/Version.java b/src/core/lombok/core/Version.java
index 035f5e8a..18c78b04 100644
--- a/src/core/lombok/core/Version.java
+++ b/src/core/lombok/core/Version.java
@@ -30,7 +30,7 @@ public class Version {
 	// ** CAREFUL ** - this class must always compile with 0 dependencies (it must not refer to any other sources or libraries).
 	// Note: In 'X.Y.Z', if Z is odd, its a snapshot build built from the repository, so many different 0.10.3 versions can exist, for example.
 	// Official builds always end in an even number. (Since 0.10.2).
-	private static final String VERSION = "1.16.17";
+	private static final String VERSION = "1.16.19";
 	private static final String RELEASE_NAME = "Edgy Guinea Pig";
 //	private static final String RELEASE_NAME = "Dancing Elephant";
 	
diff --git a/src/core/lombok/core/handlers/singulars.txt b/src/core/lombok/core/handlers/singulars.txt
index 9976c76c..d77308cb 100644
--- a/src/core/lombok/core/handlers/singulars.txt
+++ b/src/core/lombok/core/handlers/singulars.txt
@@ -19,7 +19,7 @@ Mice = mouse
 Lice = louse
 News = !
 # We could add more detail (axemen, boatsmen, boogymen, cavemen, gentlemen, etc, but (A) there's stuff like 'cerumen', and (B) the 'men' ending is common in singulars and other languages.)
-# Therefore, the odds of a mistake are too high, so other than these 2 well known cases, so force the explicit singular.
+# Therefore, the odds of a mistake are too high, so other than these 2 well known cases, force the explicit singular.
 Men = man
 Women = woman
 minutiae = minutia
@@ -48,7 +48,9 @@ hives = hive
 -shes = sh
 -lves = lf
 -rves = rf
--ves = fe
+saves = save
+Leaves = leaf
+-ves = !
 -ss = !
 -us = !
 -s = 
diff --git a/src/core/lombok/eclipse/handlers/HandleConstructor.java b/src/core/lombok/eclipse/handlers/HandleConstructor.java
index 856f3611..3469e6bf 100644
--- a/src/core/lombok/eclipse/handlers/HandleConstructor.java
+++ b/src/core/lombok/eclipse/handlers/HandleConstructor.java
@@ -350,7 +350,7 @@ public class HandleConstructor {
 				Annotation[] nonNulls = findAnnotations(field, NON_NULL_PATTERN);
 				Annotation[] nullables = findAnnotations(field, NULLABLE_PATTERN);
 				if (nonNulls.length != 0) {
-					Statement nullCheck = generateNullCheck(field, sourceNode);
+					Statement nullCheck = generateNullCheck(parameter, sourceNode);
 					if (nullCheck != null) nullChecks.add(nullCheck);
 				}
 				parameter.annotations = copyAnnotations(source, nonNulls, nullables);
diff --git a/src/core/lombok/javac/apt/LombokFileObjects.java b/src/core/lombok/javac/apt/LombokFileObjects.java
index 4edf7f6e..cb2036e9 100644
--- a/src/core/lombok/javac/apt/LombokFileObjects.java
+++ b/src/core/lombok/javac/apt/LombokFileObjects.java
@@ -22,6 +22,7 @@
 
 package lombok.javac.apt;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.net.URI;
 import java.nio.file.Path;
@@ -111,6 +112,18 @@ final class LombokFileObjects {
 			catch (Exception e) {}
 			return Compiler.JAVAC7;
 		}
+		if (jfmClassName.equals("com.sun.tools.javac.api.ClientCodeWrapper$WrappedStandardJavaFileManager")) {
+			try {
+				Field wrappedField = Class.forName("com.sun.tools.javac.api.ClientCodeWrapper$WrappedJavaFileManager").getDeclaredField("clientJavaFileManager");
+				wrappedField.setAccessible(true);
+				JavaFileManager wrappedManager = (JavaFileManager)wrappedField.get(jfm);
+				Class<?> superType = Class.forName("com.sun.tools.javac.file.BaseFileManager");
+				if (superType.isInstance(wrappedManager)) {
+					return new Java9Compiler(wrappedManager);
+				}
+			}
+			catch (Exception e) {}
+		}
 		try {
 			if (Class.forName("com.sun.tools.javac.file.BaseFileObject") == null) throw new NullPointerException();
 			return Compiler.JAVAC7;
diff --git a/src/core/lombok/javac/handlers/HandleConstructor.java b/src/core/lombok/javac/handlers/HandleConstructor.java
index 56036963..929de3cd 100644
--- a/src/core/lombok/javac/handlers/HandleConstructor.java
+++ b/src/core/lombok/javac/handlers/HandleConstructor.java
@@ -289,7 +289,7 @@ public class HandleConstructor {
 				JCVariableDecl param = maker.VarDef(maker.Modifiers(flags, nonNulls.appendList(nullables)), fieldName, field.vartype, null);
 				params.append(param);
 				if (!nonNulls.isEmpty()) {
-					JCStatement nullCheck = generateNullCheck(maker, fieldNode, source);
+					JCStatement nullCheck = generateNullCheck(maker, fieldNode, param, source);
 					if (nullCheck != null) nullChecks.append(nullCheck);
 				}
 			}
diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
index 1ec2939e..23206b43 100644
--- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java
+++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
@@ -1211,16 +1211,25 @@ public class JavacHandlerUtil {
 	}
 	
 	/**
-	 * Generates a new statement that checks if the given variable is null, and if so, throws a specified exception with the
+	 * Generates a new statement that checks if the given variable is null, and if so, throws a configured exception with the
 	 * variable name as message.
-	 * 
-	 * @param exName The name of the exception to throw; normally {@code java.lang.NullPointerException}.
 	 */
 	public static JCStatement generateNullCheck(JavacTreeMaker maker, JavacNode variable, JavacNode source) {
+		return generateNullCheck(maker, variable, (JCVariableDecl)variable.get(), source);
+	}
+
+	/**
+	 * Generates a new statement that checks if the given variable is null, and if so, throws a configured exception with the
+	 * variable name as message. 
+	 * 
+	 * This is a special case method reserved for use when the provided declaration differs from the
+	 * variable's declaration, i.e. in a constructor or setter where the local parameter is named the same but with the prefix
+	 * stripped as a result of @Accessors.prefix.
+	 */
+	public static JCStatement generateNullCheck(JavacTreeMaker maker, JavacNode variable, JCVariableDecl varDecl, JavacNode source) {
 		NullCheckExceptionType exceptionType = source.getAst().readConfiguration(ConfigurationKeys.NON_NULL_EXCEPTION_TYPE);
 		if (exceptionType == null) exceptionType = NullCheckExceptionType.NULL_POINTER_EXCEPTION;
 		
-		JCVariableDecl varDecl = (JCVariableDecl) variable.get();
 		if (isPrimitive(varDecl.vartype)) return null;
 		Name fieldName = varDecl.name;
 		JCExpression exType = genTypeRef(variable, exceptionType.getExceptionType());