diff --git a/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java
index 8b7acae74..0d1ec00e3 100644
--- a/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java
+++ b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java
@@ -73,11 +73,14 @@ public class LibrariesIndexer {
   }
 
   public void parseIndex() throws IOException {
+    index = new EmptyLibrariesIndex(); // Fallback
+
     if (!indexFile.exists()) {
-      index = new EmptyLibrariesIndex();
-    } else {
-      parseIndex(indexFile);
+      return;
     }
+
+    parseIndex(indexFile);
+
     // TODO: resolve libraries inner references
   }