diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/PublishingPlugin.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/PublishingPlugin.java
index 58db9ac030b..c641deada53 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/PublishingPlugin.java
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/PublishingPlugin.java
@@ -120,16 +120,9 @@ public void apply(Project project) {
 
               Set<String> allFirebaseProjects =
                   project.getSubprojects().stream()
-                      .filter(
-                          sub ->
-                              sub.getExtensions().findByType(FirebaseLibraryExtension.class)
-                                  != null)
-                      .map(
-                          sub ->
-                              sub.getExtensions()
-                                  .findByType(FirebaseLibraryExtension.class)
-                                  .artifactId
-                                  .get())
+                      .map(sub -> sub.getExtensions().findByType(FirebaseLibraryExtension.class))
+                      .filter(ext -> ext != null)
+                      .map(ext -> ext.artifactId.get())
                       .collect(Collectors.toSet());
 
               Set<FirebaseLibraryExtension> projectsToPublish =
@@ -140,7 +133,8 @@ public void apply(Project project) {
                               project
                                   .project(name)
                                   .getExtensions()
-                                  .getByType(FirebaseLibraryExtension.class))
+                                  .findByType(FirebaseLibraryExtension.class))
+                      .filter(ext -> ext != null)
                       .flatMap(lib -> lib.getLibrariesToRelease().stream())
                       .collect(Collectors.toSet());
               project