diff --git a/src/adql/translator/SQLServerTranslator.java b/src/adql/translator/SQLServerTranslator.java
index b147bee54053ac18631feaba821b519f2720f5fe..e721c557eabfd134e1cdf2dc4f186fb33de38a94 100644
--- a/src/adql/translator/SQLServerTranslator.java
+++ b/src/adql/translator/SQLServerTranslator.java
@@ -252,7 +252,7 @@ public class SQLServerTranslator extends JDBCTranslator {
 			}
 		}
 		// DEFAULT CASE:
-		else
+		else if (join.getJoinCondition() != null)
 			sql.append(translate(join.getJoinCondition()));
 
 		return sql.toString();