diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmObjectIdResolver.java b/ccm-core/src/main/java/org/libreccm/core/CcmObjectIdResolver.java
index c82fab5da..2261a1e97 100644
--- a/ccm-core/src/main/java/org/libreccm/core/CcmObjectIdResolver.java
+++ b/ccm-core/src/main/java/org/libreccm/core/CcmObjectIdResolver.java
@@ -57,14 +57,15 @@ public class CcmObjectIdResolver implements Serializable, ObjectIdResolver {
                 .createCdiUtil()
                 .findBean(CcmObjectRepository.class)
                 .findFirstObjectByUuid(id.key.toString())
-                .orElseThrow(
-                    () -> new IllegalArgumentException(
-                        String.format(
-                            "No CcmObject with UUID %s in the database.",
-                            id.key.toString()
-                        )
-                    )
-                );
+                .orElse(null);
+//                .orElseThrow(
+//                    () -> new IllegalArgumentException(
+//                        String.format(
+//                            "No CcmObject with UUID %s in the database.",
+//                            id.key.toString()
+//                        )
+//                    )
+//                );
         } catch (NonUniqueResultException ex) {
             throw new UnexpectedErrorException(
                 String.format(