diff --git a/app/src/cc/arduino/libraries/contributions/ui/ContributedLibraryTableCell.java b/app/src/cc/arduino/libraries/contributions/ui/ContributedLibraryTableCell.java
index 7ca176811..02303b99f 100644
--- a/app/src/cc/arduino/libraries/contributions/ui/ContributedLibraryTableCell.java
+++ b/app/src/cc/arduino/libraries/contributions/ui/ContributedLibraryTableCell.java
@@ -306,6 +306,12 @@ public class ContributedLibraryTableCell extends InstallerTableCell {
 
   private Component getUpdatedCellComponent(Object value, boolean isSelected, int row, boolean hasBuiltInRelease) {
     ContributedLibraryReleases releases = (ContributedLibraryReleases) value;
+
+    //FIXME: happens on macosx, don't know why
+    if (releases == null) {
+      return panel;
+    }
+
     ContributedLibrary selectedLib = releases.getSelected();
     ContributedLibrary installedLib = releases.getInstalled();