diff --git a/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java b/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java
index 0b74abefc2..c97ff00ed1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java
@@ -93,8 +93,8 @@ public class CatalogImpl extends AbstractQueryPart implements Catalog {
     }
 
     @Override
-    public String getComment() {
-        return null;
+    public final String getComment() {
+        return comment == null ? null : comment.getComment();
     }
 
     @Override