diff --git a/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java b/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java
index 2ac5286a73a..49cb45aee94 100644
--- a/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java
+++ b/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java
@@ -368,7 +368,9 @@ private Component getUpdatedCellComponent(Object value, boolean isSelected, int
     for (ContributedBoard board : selected.getBoards()) {
       desc += board.getName() + ", ";
     }
-    desc = desc.substring(0, desc.lastIndexOf(',')) + ".<br />";
+    if (desc.lastIndexOf(',') != -1) {
+      desc = desc.substring(0, desc.lastIndexOf(',')) + ".<br />";
+    }
 
     ContributedHelp help = null;
     if (selected.getHelp() != null) {