diff --git a/be.iminds.iot.dianne.repository/src/be/iminds/iot/dianne/repository/file/DianneFileRepository.java b/be.iminds.iot.dianne.repository/src/be/iminds/iot/dianne/repository/file/DianneFileRepository.java
index 879c26a5..5cfcf4d7 100644
--- a/be.iminds.iot.dianne.repository/src/be/iminds/iot/dianne/repository/file/DianneFileRepository.java
+++ b/be.iminds.iot.dianne.repository/src/be/iminds/iot/dianne/repository/file/DianneFileRepository.java
@@ -285,7 +285,8 @@ public boolean accept(File dir, String name) {
 		}
 		if(candidates != null){
 			for(String candidate : candidates){
-				parseTags(candidate.substring(37), tags);
+				if(candidate.length() > 37)
+					parseTags(candidate.substring(37), tags);
 			}
 		}