diff --git a/flow/src/org/labkey/flow/FlowModule.java b/flow/src/org/labkey/flow/FlowModule.java
index cbe2d66b2..d53cf1bad 100644
--- a/flow/src/org/labkey/flow/FlowModule.java
+++ b/flow/src/org/labkey/flow/FlowModule.java
@@ -281,9 +281,7 @@ protected void startupAfterSpringConfig(ModuleContext moduleContext)
         AssayService.get().registerAssayProvider(new FlowAssayProvider());
 
         FolderTypeManager.get().registerFolderType(this, new FlowFolderType(this));
-        SearchService ss = SearchService.get();
-        if (null != ss)
-            ss.addDocumentParser(FCSHeader.documentParser);
+        SearchService.get().addDocumentParser(FCSHeader.documentParser);
         FlowController.registerAdminConsoleLinks();
 
         FileContentService fcs = FileContentService.get();
@@ -298,10 +296,7 @@ protected void startupAfterSpringConfig(ModuleContext moduleContext)
         if (null != svc)
         {
             FlowManager mgr = FlowManager.get();
-            if (null != mgr)
-            {
-                svc.registerUsageMetrics(NAME, mgr::getUsageMetrics);
-            }
+            svc.registerUsageMetrics(NAME, mgr::getUsageMetrics);
         }
 
         FlowSchema.registerContainerListener();
diff --git a/ms2/src/org/labkey/ms2/MS2Module.java b/ms2/src/org/labkey/ms2/MS2Module.java
index 793ac3790..da4cfd5d1 100644
--- a/ms2/src/org/labkey/ms2/MS2Module.java
+++ b/ms2/src/org/labkey/ms2/MS2Module.java
@@ -219,15 +219,11 @@ protected void startupAfterSpringConfig(ModuleContext moduleContext)
         MS2Controller.registerAdminConsoleLinks();
 
         SearchService ss = SearchService.get();
-
-        if (null != ss)
-        {
-            ss.addDocumentParser(new MzXMLDocumentParser());
-            ss.addDocumentParser(new MzMLDocumentParser());
-            ss.addDocumentParser(new DatDocumentParser());
-            ss.addDocumentParser(new SequestLogDocumentParser());
-            ss.addDocumentParser(new MGFDocumentParser());
-        }
+        ss.addDocumentParser(new MzXMLDocumentParser());
+        ss.addDocumentParser(new MzMLDocumentParser());
+        ss.addDocumentParser(new DatDocumentParser());
+        ss.addDocumentParser(new SequestLogDocumentParser());
+        ss.addDocumentParser(new MGFDocumentParser());
 
         FileContentService fcs = FileContentService.get();
         if (fcs != null)