diff --git a/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java
index 1564a772d3..e3d31c6e73 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java
@@ -117,7 +117,8 @@ public class SchemaImpl extends AbstractNamed implements Schema {
             }
         }
 
-        ctx.visit(Tools.getMappedSchema(ctx.configuration(), this).getUnqualifiedName());
+        Schema mappedSchema = Tools.getMappedSchema(ctx.configuration(), this);
+        ctx.visit(mappedSchema != null ? mappedSchema.getUnqualifiedName() : getUnqualifiedName());
     }
 
     @Override