diff --git a/jOOQ/src/main/java/org/jooq/impl/EnumConverter.java b/jOOQ/src/main/java/org/jooq/impl/EnumConverter.java
index 166e938ce2..93b5cd306f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/EnumConverter.java
+++ b/jOOQ/src/main/java/org/jooq/impl/EnumConverter.java
@@ -83,7 +83,10 @@ public class EnumConverter<T, U extends Enum<U>> implements Converter<T, U> {
      */
     @Override
     public T to(U userObject) {
-        if (enumType == EnumType.ORDINAL) {
+        if (userObject == null) {
+            return null;
+        }
+        else if (enumType == EnumType.ORDINAL) {
             return convert(userObject.ordinal(), fromType);
         }
         else {