From 2baa64a25e222b04e77724d35e57485ffe3dc566 Mon Sep 17 00:00:00 2001
From: Lum <klum@labkey.com>
Date: Tue, 7 Apr 2026 14:10:33 -0700
Subject: [PATCH] Better handling for missing assay request module.

---
 .../org/labkey/issue/model/IssueListDef.java  |  3 +++
 .../issue/query/IssuesListDefTable.java       | 21 ++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/issues/src/org/labkey/issue/model/IssueListDef.java b/issues/src/org/labkey/issue/model/IssueListDef.java
index fb76bba274e..b518d2eaed6 100644
--- a/issues/src/org/labkey/issue/model/IssueListDef.java
+++ b/issues/src/org/labkey/issue/model/IssueListDef.java
@@ -44,6 +44,7 @@
 import org.labkey.api.security.User;
 import org.labkey.api.util.GUID;
 import org.labkey.api.util.UnexpectedException;
+import org.labkey.api.view.NotFoundException;
 import org.labkey.issue.query.IssueDefDomainKind;
 
 import java.util.Collection;
@@ -159,6 +160,8 @@ public AbstractIssuesListDefDomainKind getDomainKind()
     private static String generateDomainURI(Container c, User user, String name, String kindName)
     {
         DomainKind<?> domainKind = PropertyService.get().getDomainKindByName(kindName);
+        if (domainKind == null)
+            throw new NotFoundException("Domain kind not found: " + kindName);
         return domainKind.generateDomainURI(IssuesSchema.getInstance().getSchemaName(), name, c, user);
     }
 
diff --git a/issues/src/org/labkey/issue/query/IssuesListDefTable.java b/issues/src/org/labkey/issue/query/IssuesListDefTable.java
index 8f2ee74d5e9..f4a91adff0c 100644
--- a/issues/src/org/labkey/issue/query/IssuesListDefTable.java
+++ b/issues/src/org/labkey/issue/query/IssuesListDefTable.java
@@ -182,21 +182,28 @@ public void addQueryFieldKeys(Set<FieldKey> keys)
                     @Override
                     public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                     {
-                        Container c = getContainer(ctx);
-                        if (c != null)
+                        try
                         {
-                            if (c.hasPermission(getUserSchema().getUser(), ReadPermission.class))
+                            Container c = getContainer(ctx);
+                            if (c != null)
                             {
-                                out.write(LinkBuilder.simpleLink(c.getName(), c.getStartURL(getUserSchema().getUser())));
+                                if (c.hasPermission(getUserSchema().getUser(), ReadPermission.class))
+                                {
+                                    out.write(LinkBuilder.simpleLink(c.getName(), c.getStartURL(getUserSchema().getUser())));
+                                }
+                                else
+                                {
+                                    out.write(c.getName());
+                                }
                             }
                             else
                             {
-                                out.write(c.getName());
+                                super.renderGridCellContents(ctx, out);
                             }
                         }
-                        else
+                        catch (Exception e)
                         {
-                            super.renderGridCellContents(ctx, out);
+                            out.write(e.getMessage());
                         }
                     }
                 };