diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc
index 4f8897b12..516fd8ecb 100644
--- a/log_manager/log_manager.cc
+++ b/log_manager/log_manager.cc
@@ -2981,7 +2981,7 @@ static void* thr_filewriter_fun(
                                                != 0);
                                         node = node->mlnode_next;
                                         vn2 = bb_list->mlist_versno;
-                                } while (vn1 != vn2);
+                                } while (vn1 != vn2 && node);
                     
                         } /* while (node != NULL) */