diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/Configuration.java b/querydsl-sql/src/main/java/com/mysema/query/sql/Configuration.java
index 50a8deec0..af0ad65ea 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/Configuration.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/Configuration.java
@@ -268,7 +268,8 @@ public final class Configuration {
      * @return
      */
     public String registerTableOverride(String schema, String oldTable, String newTable) {
-        return registerTableOverride(schema, oldTable, schema, newTable).getTable();
+        SchemaAndTable st = registerTableOverride(schema, oldTable, schema, newTable);
+        return st != null ? st.getTable() : null;
     }
 
     /**