diff --git a/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java b/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java
index 47c12a897..d5b50f66f 100644
--- a/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java
+++ b/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java
@@ -201,6 +201,9 @@ public class LibrariesIndexTableModel extends FilteredAbstractTableModel<Contrib
 
   @Override
   public Object getValueAt(int row, int col) {
+    if (row >= contributions.size()) {
+      return null;
+    }
     ContributedLibraryReleases contribution = contributions.get(row);
     if (col == DESCRIPTION_COL) {
       return contribution;// .getSelected();
diff --git a/app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java b/app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java
index bf0880e70..f1d0a9f18 100644
--- a/app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java
+++ b/app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java
@@ -196,6 +196,9 @@ public class ContributionIndexTableModel extends FilteredAbstractTableModel<Cont
 
   @Override
   public Object getValueAt(int row, int col) {
+    if (row >= contributions.size()) {
+      return null;
+    }
     ContributedPlatformReleases contribution = contributions.get(row);
     if (col == DESCRIPTION_COL) {
       return contribution;// .getSelected();