diff --git a/dict.c b/dict.c
index 1002234..eaa4006 100644
--- a/dict.c
+++ b/dict.c
@@ -232,7 +232,7 @@
     if (dict == NULL)
 	return;
     if (dict->dict) {
-	for(i = 0; i < dict->size; i++) {
+	for(i = 0; ((i < dict->size) && (dict->nbElems > 0)); i++) {
 	    iter = &(dict->dict[i]);
 	    if (iter->valid == 0)
 		continue;
@@ -243,6 +243,7 @@
 		    xmlFree(iter->name);
 		if (!inside_dict)
 		    xmlFree(iter);
+		dict->nbElems--;
 		inside_dict = 0;
 		iter = next;
 	    }