diff --git a/source/ChangeLog b/source/ChangeLog
index 5fa33cd..975134a 100644
--- a/source/ChangeLog
+++ b/source/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-27  Evgeniy Kozhuhovskiy  <ugenk@mgts.by>
+
+	* bforce/nodelist.c (nodelist_open): some fixes
+
 2006-02-05  Evgeniy Kozhuhovskiy  <e.kozhuhovskiy@gmail.com>
 
 	* bforce/logger.c: trying to fix broken syslog.
diff --git a/source/bforce/nodelist.c b/source/bforce/nodelist.c
index 71227bd..17958e7 100644
--- a/source/bforce/nodelist.c
+++ b/source/bforce/nodelist.c
@@ -301,10 +301,11 @@ s_nodelist *nodelist_open(const char *dir, char *name, int mode)
    	     struct stat ndfile;
 	     time_t lasttime = 0;
 	     struct dirent *ndir;
-	     DIR *ndirstream;
+	     DIR *ndirstream = NULL;
 	     if( (ndirstream = opendir(dir)) == NULL )
 	     {
 		  log("error opening nodelist directory: %s", dir);
+		  return NULL;
 	     }
 	     else
 	     {
@@ -337,8 +338,8 @@ s_nodelist *nodelist_open(const char *dir, char *name, int mode)
 			    }
 		       }
 		  }
+		  closedir(ndirstream);
 	     }
-	     closedir(ndirstream);
 	}
 
 	if( strcmp(name+strlen(name)-4, ".999") == 0 )