Index: vm/vmcore/src/kernel_classes/javasrc/java/lang/reflect/Field.java
===================================================================
--- vm/vmcore/src/kernel_classes/javasrc/java/lang/reflect/Field.java	(revision 597694)
+++ vm/vmcore/src/kernel_classes/javasrc/java/lang/reflect/Field.java	(working copy)
@@ -403,11 +403,9 @@
     private Object checkSet(Class callerClass, Object obj)
         throws IllegalArgumentException, IllegalAccessException {
         obj = checkObject(getDeclaringClass(), getModifiers(), obj);
-        if (Modifier.isFinal(getModifiers())) {
-            // TODO perform this check for 1.5.0
-            // && !(isAccessible && obj != null)) {
+        if (Modifier.isFinal(getModifiers()) && !isAccessible) {
             throw new IllegalAccessException(
-                "Can not assign new value to the field with final modifier");
+                "Cannot assign a new value to the field with a final modifier");
         }
         if (!isAccessible) {
             reflectExporter.checkMemberAccess(callerClass, getDeclaringClass(),