diff --git a/src/main/java/org/citydb/sqlbuilder/select/join/Join.java b/src/main/java/org/citydb/sqlbuilder/select/join/Join.java
index 8d2ef01..5393ce3 100644
--- a/src/main/java/org/citydb/sqlbuilder/select/join/Join.java
+++ b/src/main/java/org/citydb/sqlbuilder/select/join/Join.java
@@ -63,7 +63,8 @@ public JoinName getJoinName() {
 	}
 
 	public void setJoinName(JoinName name) {
-		this.name = name;
+		if (name != null)
+			this.name = name;
 	}
 	
 	public void getInvolvedTables(Set<Table> tables) {
@@ -73,7 +74,7 @@ public void getInvolvedTables(Set<Table> tables) {
 	
 	@Override
 	public String toString() {		
-		return String.valueOf(getJoinName()) + " " + toColumn.getTable() + " on " + condition;
+		return name + " " + toColumn.getTable() + " on " + condition;
 	}
 
 }