diff --git a/src/main/java/com/redhat/pctsec/model/jpa/UriConverter.java b/src/main/java/com/redhat/pctsec/model/jpa/UriConverter.java
index c96d21f..45eb7a7 100644
--- a/src/main/java/com/redhat/pctsec/model/jpa/UriConverter.java
+++ b/src/main/java/com/redhat/pctsec/model/jpa/UriConverter.java
@@ -17,6 +17,8 @@ public class UriConverter implements AttributeConverter<URI, String>
 
     @Override
     public URI convertToEntityAttribute(String s) {
-        return ((s.length() > 0) ? URI.create(s.trim()) : null);
+        if(s != null)
+            return ((s.length() > 0) ? URI.create(s.trim()) : null);
+        return null;
     }
 }