diff --git a/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryReleasesComparator.java b/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryReleasesComparator.java
index b302306523c..11436b2ccfb 100644
--- a/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryReleasesComparator.java
+++ b/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryReleasesComparator.java
@@ -32,7 +32,9 @@
 import cc.arduino.contributions.libraries.ContributedLibrary;
 import cc.arduino.contributions.libraries.ContributedLibraryReleases;
 
+import java.util.Arrays;
 import java.util.Comparator;
+import java.util.List;
 
 public class ContributedLibraryReleasesComparator implements Comparator<ContributedLibraryReleases> {
 
@@ -47,9 +49,11 @@ public int compare(ContributedLibraryReleases o1, ContributedLibraryReleases o2)
     ContributedLibrary lib1 = o1.getLatest();
     ContributedLibrary lib2 = o2.getLatest();
 
-    if (lib1.getTypes() == null || lib2.getTypes() == null) {
-      return compareName(lib1, lib2);
-    }
+    List<String> types1 = lib1.getTypes();
+    List<String> types2 = lib2.getTypes();
+    if (types1 == null) types1 = Arrays.asList();
+    if (types2 == null) types2 = Arrays.asList();
+
     if (lib1.getTypes().contains(firstType) && lib2.getTypes().contains(firstType)) {
       return compareName(lib1, lib2);
     }