diff --git a/ChangeLog b/ChangeLog
index fec990ed..f86487cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-13  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Code cleanup
+	* src/BNode.cc
+
 2009-04-13  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Increase prefixLength for the bucket which doesn't own local node
diff --git a/src/BNode.cc b/src/BNode.cc
index 018d7574..d0489935 100644
--- a/src/BNode.cc
+++ b/src/BNode.cc
@@ -176,10 +176,10 @@ void BNode::findClosestKNodes(std::deque<SharedHandle<DHTNode> >& nodes,
 	bnode = bnode->getUp();
       }
     }
-    visited.push_back(bnode);
     if(!bnode) {
       break;
     }
+    visited.push_back(bnode);
     {
       SharedHandle<DHTBucket> bucket = bnode->getBucket();
       if(!bucket.isNull()) {
@@ -194,7 +194,6 @@ void BNode::findClosestKNodes(std::deque<SharedHandle<DHTNode> >& nodes,
       }
     }
   }
-  return;
 }
 
 void BNode::enumerateBucket(std::deque<SharedHandle<DHTBucket> >& buckets,