diff --git a/api/src/org/labkey/api/admin/AdminBean.java b/api/src/org/labkey/api/admin/AdminBean.java
index 62631713f3c..8b928e6ba07 100644
--- a/api/src/org/labkey/api/admin/AdminBean.java
+++ b/api/src/org/labkey/api/admin/AdminBean.java
@@ -24,7 +24,6 @@
 import org.labkey.api.data.ContainerManager;
 import org.labkey.api.data.CoreSchema;
 import org.labkey.api.data.DbScope;
-import org.labkey.api.module.Module;
 import org.labkey.api.module.ModuleLoader;
 import org.labkey.api.security.UserManager;
 import org.labkey.api.settings.AppProps;
@@ -43,7 +42,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -82,7 +80,6 @@ public static class RecentUser
     public static final String sessionTimeout = Formats.commaf0.format(ModuleLoader.getServletContext().getSessionTimeout());
     public static final String buildTime = ModuleLoader.getInstance().getCoreModule().getBuildTime();
     public static final String serverStartupTime = DateUtil.formatDateTime(ContainerManager.getRoot());
-    public static final List<Module> modules;
 
     public static String asserts = "disabled";
 
@@ -116,9 +113,6 @@ public static class RecentUser
 
         //noinspection ConstantConditions,AssertWithSideEffects
         assert null != (asserts = "enabled");
-
-        modules = new ArrayList<>(ModuleLoader.getInstance().getModules());
-        modules.sort(Comparator.comparing(Module::getName, String.CASE_INSENSITIVE_ORDER));
     }
 
     private static @Nullable String getValue(Field field)
diff --git a/core/src/org/labkey/core/admin/AdminController.java b/core/src/org/labkey/core/admin/AdminController.java
index 6adb7f6825d..98df842b77c 100644
--- a/core/src/org/labkey/core/admin/AdminController.java
+++ b/core/src/org/labkey/core/admin/AdminController.java
@@ -9193,7 +9193,7 @@ protected void renderView(Object model, HtmlWriter out)
                                         if (null != module.getZippedPath())
                                             p = module.getZippedPath().toPath();
                                         if (isDevMode && ModuleEditorService.get().canEditSourceModule(module))
-                                            if (!module.getExplodedPath().getPath().equals(module.getSourcePath()))
+                                            if (!isBlank(module.getSourcePath()) && !module.getExplodedPath().getPath().equals(module.getSourcePath()))
                                                 p = Paths.get(module.getSourcePath());
                                         fullPathToModule = p.toString();
                                         shortPathToModule = fullPathToModule;
diff --git a/core/src/org/labkey/core/admin/admin.jsp b/core/src/org/labkey/core/admin/admin.jsp
index 9975bfc4703..81aaa1c7749 100644
--- a/core/src/org/labkey/core/admin/admin.jsp
+++ b/core/src/org/labkey/core/admin/admin.jsp
@@ -23,6 +23,7 @@
 <%@ page import="org.labkey.api.files.FileContentService" %>
 <%@ page import="org.labkey.api.module.DefaultModule" %>
 <%@ page import="org.labkey.api.module.Module" %>
+<%@ page import="org.labkey.api.module.ModuleLoader"%>
 <%@ page import="org.labkey.api.moduleeditor.api.ModuleEditorService" %>
 <%@ page import="org.labkey.api.settings.AdminConsole" %>
 <%@ page import="org.labkey.api.settings.AdminConsole.AdminLink" %>
@@ -36,7 +37,9 @@
 <%@ page import="java.time.Duration" %>
 <%@ page import="java.time.LocalDateTime" %>
 <%@ page import="java.time.format.DateTimeFormatter" %>
+<%@ page import="java.util.ArrayList" %>
 <%@ page import="java.util.Collection" %>
+<%@ page import="java.util.Comparator" %>
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.TreeMap" %>
 <%@ page import="org.apache.commons.lang3.Strings" %>
@@ -152,7 +155,9 @@
             <%=link("Module Details", AdminController.ModulesAction.class)%>
             <br/><br/>
             <table><%
-                for (Module module : AdminBean.modules)
+                ArrayList<Module> modules = new ArrayList<>(ModuleLoader.getInstance().getModules());
+                modules.sort(Comparator.comparing(Module::getName, String.CASE_INSENSITIVE_ORDER));
+                for (Module module : modules)
                 {
                     String guid = makeId("m_");
                     String toggleScript = "return LABKEY.Utils.toggleLink(document.getElementById(" + q(guid) + "), false);";