diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaJoinColumn.java
index 51112d5..a357dd5 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaJoinColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaJoinColumn.java
@@ -176,7 +176,7 @@
 		if (getSpecifiedReferencedColumnName() == null && this.getOwner().joinColumnsSize() > 1) {
 			messages.add(this.buildUnspecifiedReferencedColumnNameMultipleJoinColumnsMessage(astRoot));
 		}
-		else if (this.getReferencedColumnName() != null) {
+		else if (this.getSpecifiedReferencedColumnName() != null) {
 			if (this.getReferencedColumnDbTable() != null && ! this.isReferencedColumnResolved()) {
 				messages.add(getOwner().buildUnresolvedReferencedColumnNameMessage(this, this.getReferencedColumnNameTextRange(astRoot)));
 			}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java
index 968bcfe..c9b27ba 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java
@@ -180,7 +180,7 @@
 		if (this.getSpecifiedReferencedColumnName() == null && this.getOwner().joinColumnsSize() > 1) {
 			messages.add(this.buildUnspecifiedReferencedColumnNameMultipleJoinColumnsMessage());
 		}
-		else if (this.getReferencedColumnName() != null) {
+		else if (this.getSpecifiedReferencedColumnName() != null) {
 			Table refColumnDbTable = this.getReferencedColumnDbTable();
 			if (refColumnDbTable != null && ! this.isReferencedColumnResolved()) {
 				messages.add(getOwner().buildUnresolvedReferencedColumnNameMessage(this, this.getReferencedColumnNameTextRange()));
