diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 623678e23..b45098d31 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-@labkey-martyp
\ No newline at end of file
+*	@labkey-martyp
\ No newline at end of file
diff --git a/snd/src/org/labkey/snd/SNDManager.java b/snd/src/org/labkey/snd/SNDManager.java
index 4ad8e57b7..d04bd0cc8 100644
--- a/snd/src/org/labkey/snd/SNDManager.java
+++ b/snd/src/org/labkey/snd/SNDManager.java
@@ -2744,12 +2744,14 @@ private void ensureValidPackage(Event event, EventData eventData, Package pkg)
         for (SuperPackage superPackage : pkg.getSubpackages())
         {
             found = false;
-            for (EventData data : eventData.getSubPackages())
-            {
-                if (data.getSuperPkgId() == superPackage.getSuperPkgId())
+            if (eventData.getSubPackages() != null) {
+                for (EventData data : eventData.getSubPackages())
                 {
-                    found = true;
-                    ensureValidPackage(event, data, superPackage.getPkg());
+                    if (data.getSuperPkgId() == superPackage.getSuperPkgId())
+                    {
+                        found = true;
+                        ensureValidPackage(event, data, superPackage.getPkg());
+                    }
                 }
             }