1 files changed, 3 insertions, 3 deletions

diff --git a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java
index e149a1f14..136512077 100755
--- a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java
@@ -340,15 +340,15 @@ public class CpsModulePersistenceServiceImpl implements CpsModulePersistenceServ
         if (optionalFileName.isPresent()) {
             return optionalFileName.get();
         }
-        return null;
+        return "no filename";
     }
 
     private String getDuplicatedChecksumFromException(final ConstraintViolationException exception) {
         final Matcher matcher = CHECKSUM_EXCEPTION_PATTERN.matcher(exception.getSQLException().getMessage());
-        if (matcher.find() && matcher.groupCount() == 1) {
+        if (matcher.find()) {
             return matcher.group(1);
         }
-        return null;
+        return "no checksum found";
     }
 
     private static ModuleReference toModuleReference(