diff --git a/plugin/trino-faker/src/main/java/io/trino/plugin/faker/FakerColumnHandle.java b/plugin/trino-faker/src/main/java/io/trino/plugin/faker/FakerColumnHandle.java
index 96d870eafb8..c1895eb2d2e 100644
--- a/plugin/trino-faker/src/main/java/io/trino/plugin/faker/FakerColumnHandle.java
+++ b/plugin/trino-faker/src/main/java/io/trino/plugin/faker/FakerColumnHandle.java
@@ -51,6 +51,7 @@ public record FakerColumnHandle(
     {
         requireNonNull(name, "name is null");
         requireNonNull(type, "type is null");
+        requireNonNull(domain, "domain is null");
     }
 
     public static FakerColumnHandle of(int columnId, ColumnMetadata column, double defaultNullProbability)
@@ -63,20 +64,8 @@ public static FakerColumnHandle of(int columnId, ColumnMetadata column, double d
         if (generator != null && !isCharacterColumn(column)) {
             throw new TrinoException(INVALID_COLUMN_PROPERTY, "The `%s` property can only be set for CHAR, VARCHAR or VARBINARY columns".formatted(GENERATOR_PROPERTY));
         }
-        Object min;
-        try {
-            min = Literal.parse((String) column.getProperties().get(MIN_PROPERTY), column.getType());
-        }
-        catch (IllegalArgumentException e) {
-            throw new TrinoException(INVALID_COLUMN_PROPERTY, "The `%s` property must be a valid %s literal".formatted(MIN_PROPERTY, column.getType().getDisplayName()), e);
-        }
-        Object max;
-        try {
-            max = Literal.parse((String) column.getProperties().get(MAX_PROPERTY), column.getType());
-        }
-        catch (IllegalArgumentException e) {
-            throw new TrinoException(INVALID_COLUMN_PROPERTY, "The `%s` property must be a valid %s literal".formatted(MAX_PROPERTY, column.getType().getDisplayName()), e);
-        }
+        Object min = propertyValue(column, MIN_PROPERTY);
+        Object max = propertyValue(column, MAX_PROPERTY);
         Domain domain = Domain.all(column.getType());
         if (min != null || max != null) {
             if (isCharacterColumn(column)) {
@@ -114,6 +103,16 @@ private static boolean isCharacterColumn(ColumnMetadata column)
         return column.getType() instanceof CharType || column.getType() instanceof VarcharType || column.getType() instanceof VarbinaryType;
     }
 
+    private static Object propertyValue(ColumnMetadata column, String property)
+    {
+        try {
+            return Literal.parse((String) column.getProperties().get(property), column.getType());
+        }
+        catch (IllegalArgumentException e) {
+            throw new TrinoException(INVALID_COLUMN_PROPERTY, "The `%s` property must be a valid %s literal".formatted(property, column.getType().getDisplayName()), e);
+        }
+    }
+
     private static Range range(Type type, Object min, Object max)
     {
         requireNonNull(type, "type is null");