diff --git a/apps/tagtree.c b/apps/tagtree.c
index d394491960..0163ddbb2f 100644
--- a/apps/tagtree.c
+++ b/apps/tagtree.c
@@ -1385,6 +1385,8 @@ int tagtree_enter(struct tree_context* c)
     seek = dptr->extraseek;   
     if (seek == -1) 
     {
+        if(c->filesindir<=2)
+            return 0;
         srand(current_tick);
         dptr = (tagtree_get_entry(c, 2+(rand() % (c->filesindir-2))));
         seek = dptr->extraseek;
diff --git a/docs/CREDITS b/docs/CREDITS
index 91f841c214..f9dee10c3f 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -357,6 +357,7 @@ Jonas Hurrelmann
 Lee Kang Hyuk
 Clemens Werther
 Robert Menes
+Henri Valta
 
 The libmad team
 The wavpack team