diff --git a/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacFileData.java b/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacFileData.java
index 395c54876fcf..cee88472b3c0 100644
--- a/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacFileData.java
+++ b/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacFileData.java
@@ -206,7 +206,8 @@ public class JavacFileData {
       out.writeByte(FIELD_MARKER);
       out.writeUTF(((JavacRef.JavacField)ref).getContainingClass());
       out.writeUTF(ref.getOwnerName());
-      out.writeUTF(((JavacRef.JavacField)ref).getDescriptor());
+      final String descriptor = ((JavacRef.JavacField)ref).getDescriptor();
+      out.writeUTF(descriptor == null? "" : descriptor);
     }
     else if (ref instanceof JavacRef.JavacMethod) {
       out.writeByte(METHOD_MARKER);
diff --git a/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacRef.java b/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacRef.java
index 745b45618b69..75758c202eba 100644
--- a/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacRef.java
+++ b/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacRef.java
@@ -166,7 +166,7 @@ public interface JavacRef {
       super(name, modifiers);
       myContainingClassName = containingClassName;
       myOwnerName = ownerName;
-      myDescriptor = descriptor;
+      myDescriptor = descriptor != null && !descriptor.isEmpty()? descriptor : null;
     }
 
     @Override