2 files changed, 10 insertions, 4 deletions
diff --git a/src/core/lombok/javac/handlers/HandleFieldDefaults.java b/src/core/lombok/javac/handlers/HandleFieldDefaults.java
index 12c22059..52f6c39c 100644
--- a/src/core/lombok/javac/handlers/HandleFieldDefaults.java
+++ b/src/core/lombok/javac/handlers/HandleFieldDefaults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 The Project Lombok Authors.
+ * Copyright (C) 2012-2016 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -84,14 +84,16 @@ public class HandleFieldDefaults extends JavacASTAdapter {
 		if (level != null && level != AccessLevel.NONE) {
 			if ((field.mods.flags & (Flags.PUBLIC | Flags.PRIVATE | Flags.PROTECTED)) == 0) {
 				if (!hasAnnotationAndDeleteIfNeccessary(PackagePrivate.class, fieldNode)) {
-					field.mods.flags |= toJavacModifier(level);
+					if ((field.mods.flags & Flags.STATIC) == 0) {
+						field.mods.flags |= toJavacModifier(level);
+					}
 				}
 			}
 		}
 		
 		if (makeFinal && (field.mods.flags & Flags.FINAL) == 0) {
 			if (!hasAnnotationAndDeleteIfNeccessary(NonFinal.class, fieldNode)) {
-				if ((field.mods.flags & Flags.STATIC) == 0 || field.init != null) {
+				if ((field.mods.flags & Flags.STATIC) == 0) {
 					field.mods.flags |= Flags.FINAL;
 				}
 			}
diff --git a/src/core/lombok/javac/handlers/HandleGetter.java b/src/core/lombok/javac/handlers/HandleGetter.java
index a330dbc1..0a2fe362 100644
--- a/src/core/lombok/javac/handlers/HandleGetter.java
+++ b/src/core/lombok/javac/handlers/HandleGetter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2014 The Project Lombok Authors.
+ * Copyright (C) 2009-2016 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -182,6 +182,10 @@ public class HandleGetter extends JavacAnnotationHandler<Getter> {
 				source.addError("'lazy' requires the field to be private and final.");
 				return;
 			}
+			if ((fieldDecl.mods.flags & Flags.TRANSIENT) != 0) {
+				source.addError("'lazy' is not supported on transient fields.");
+				return;
+			}
 			if (fieldDecl.init == null) {
 				source.addError("'lazy' requires field initialization.");
 				return;