diff --git a/core/src/main/java/com/github/starnowski/posjsonhelper/core/Context.java b/core/src/main/java/com/github/starnowski/posjsonhelper/core/Context.java
index f1a32cff..8369d414 100644
--- a/core/src/main/java/com/github/starnowski/posjsonhelper/core/Context.java
+++ b/core/src/main/java/com/github/starnowski/posjsonhelper/core/Context.java
@@ -67,12 +67,11 @@ public static ContextBuilder builder() {
 
     /**
      * Returns copy of value of property {@link #functionsThatShouldBeExecutedWithSchemaReference}.
-     * If {@link #functionsThatShouldBeExecutedWithSchemaReference} is null then the empty set is being returned.
      *
      * @return copy of value of property {@link #functionsThatShouldBeExecutedWithSchemaReference}
      */
     public Set<String> getFunctionsThatShouldBeExecutedWithSchemaReference() {
-        return functionsThatShouldBeExecutedWithSchemaReference == null ? new HashSet<>() : new HashSet<>(functionsThatShouldBeExecutedWithSchemaReference);
+        return functionsThatShouldBeExecutedWithSchemaReference == null ? null : new HashSet<>(functionsThatShouldBeExecutedWithSchemaReference);
     }
 
     /**
@@ -116,7 +115,8 @@ public ContextBuilder withFunctionsThatShouldBeExecutedWithSchemaReference(Set<S
         public ContextBuilder withContext(Context context) {
             return withJsonbAllArrayStringsExistFunctionReference(context.getJsonbAllArrayStringsExistFunctionReference())
                     .withJsonbAnyArrayStringsExistFunctionReference(context.getJsonbAnyArrayStringsExistFunctionReference())
-                    .withSchema(context.getSchema());
+                    .withSchema(context.getSchema())
+                    .withFunctionsThatShouldBeExecutedWithSchemaReference(context.getFunctionsThatShouldBeExecutedWithSchemaReference());
         }
 
         public ContextBuilder withSchema(String schema) {
diff --git a/hibernate6-core/src/main/java/com/github/starnowski/posjsonhelper/hibernate6/descriptor/NamedSqmFunctionWithSchemaReferenceDescriptor.java b/hibernate6-core/src/main/java/com/github/starnowski/posjsonhelper/hibernate6/descriptor/NamedSqmFunctionWithSchemaReferenceDescriptor.java
index c3149223..bcbafd2f 100644
--- a/hibernate6-core/src/main/java/com/github/starnowski/posjsonhelper/hibernate6/descriptor/NamedSqmFunctionWithSchemaReferenceDescriptor.java
+++ b/hibernate6-core/src/main/java/com/github/starnowski/posjsonhelper/hibernate6/descriptor/NamedSqmFunctionWithSchemaReferenceDescriptor.java
@@ -16,6 +16,7 @@ public class NamedSqmFunctionWithSchemaReferenceDescriptor extends NamedSqmFunct
 
     protected final HibernateContext hibernateContext;
     protected final Context context;
+
     public NamedSqmFunctionWithSchemaReferenceDescriptor(String functionName, Context context, HibernateContext hibernateContext) {
         super(functionName, false, null, null);
         this.context = context;
@@ -46,8 +47,8 @@ public void render(SqlAppender sqlAppender, List<? extends SqlAstNode> sqlAstArg
         super.render(sqlAppender, sqlAstArguments, filter, respectNulls, fromFirst, returnType, walker);
     }
 
-    protected void renderOptionalSchemaReference(SqlAppender sqlAppender){
-        if (context.getFunctionsThatShouldBeExecutedWithSchemaReference().contains(getName())) {
+    protected void renderOptionalSchemaReference(SqlAppender sqlAppender) {
+        if (context.getFunctionsThatShouldBeExecutedWithSchemaReference() != null && context.getFunctionsThatShouldBeExecutedWithSchemaReference().contains(getName())) {
             sqlAppender.appendSql(context.getSchema());
             sqlAppender.appendSql(".");
         }