diff --git a/src/main/java/org/ihtsdo/buildcloud/core/dao/BuildDAOImpl.java b/src/main/java/org/ihtsdo/buildcloud/core/dao/BuildDAOImpl.java
index 6e1fbc5c4..604371407 100644
--- a/src/main/java/org/ihtsdo/buildcloud/core/dao/BuildDAOImpl.java
+++ b/src/main/java/org/ihtsdo/buildcloud/core/dao/BuildDAOImpl.java
@@ -784,6 +784,7 @@ private List<Build> filterByViewMode(List<Build> allBuilds, List<String> tagPath
             case UNPUBLISHED ->
                     allBuilds = allBuilds.stream().filter(build -> getTags(build, tagPaths) == null || !getTags(build, tagPaths).contains(Tag.PUBLISHED)).collect(Collectors.toList());
             case ALL_RELEASES -> {
+				// do nothing
             }
             case DEFAULT -> {
                 List<Build> copy = new ArrayList<>(allBuilds);
@@ -1390,7 +1391,7 @@ private GetS3ObjectResponse getS3Objects(String buildBucketName, String releaseC
 			}
 			s3Objects = new ArrayList<>();
 			buildIds.stream().parallel().forEach(buildId ->
-					s3Objects.addAll(doGetS3ObjectsByBuildId(buildBucketName, prefix, buildId))
+				s3Objects.addAll(doGetS3ObjectsByBuildId(buildBucketName, prefix, buildId))
 			);
 		} else {
 			if (isGetBuildsForProduct && !CollectionUtils.isEmpty(forYears)) {
diff --git a/src/main/java/org/ihtsdo/buildcloud/core/service/PublishServiceImpl.java b/src/main/java/org/ihtsdo/buildcloud/core/service/PublishServiceImpl.java
index e6f5712e2..69a8b9b2e 100644
--- a/src/main/java/org/ihtsdo/buildcloud/core/service/PublishServiceImpl.java
+++ b/src/main/java/org/ihtsdo/buildcloud/core/service/PublishServiceImpl.java
@@ -124,7 +124,7 @@ public List<String> getPublishedPackages(final ReleaseCenter releaseCenter) {
 	@Override
 	public List<Build> findPublishedBuilds(String releaseCenterKey, String productKey) throws ResourceNotFoundException {
 		List<Build> builds = buildDao.findAllDesc(releaseCenterKey, productKey, null, null, true, null);
-		return builds.stream().filter(item -> item.getTags().contains(Build.Tag.PUBLISHED)).toList();
+		return builds.stream().filter(item -> item.getTags() != null && item.getTags().contains(Build.Tag.PUBLISHED)).toList();
 	}
 
 	@Override