diff --git a/CHANGES b/CHANGES
index 2732e9e29a..e3c500d6d8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,18 @@
 
+1.6-dev-1198 | 2011-09-07 11:03:36 -0700
+
+  * Extended header for ASCII log that make it easier for scripts to
+    parse Bro log files. (Gilbert Clark)
+
+  * Potential fix for rotation crashes. Addresses #588. (Robin Sommer)
+    
+  * Added PF_RING load balancing support to the scripting layer,
+    enabled by loading the misc/pf-ring-load-balancing script. (Seth
+    Hall)
+
+  * Added a BiF setenv() for setting environment variables. (Seth
+    Hall)
+
 1.6-dev-1184 | 2011-09-04 09:34:50 -0700
 
   * FindPCAP now links against thread library when necessary (e.g.
diff --git a/VERSION b/VERSION
index 3128920913..64f5808603 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6-dev-1184
+1.6-dev-1198
diff --git a/src/LogMgr.cc b/src/LogMgr.cc
index 950de24a8f..700237e693 100644
--- a/src/LogMgr.cc
+++ b/src/LogMgr.cc
@@ -444,7 +444,7 @@ LogMgr::WriterInfo* LogMgr::FindWriter(LogWriter* writer)
 			{
 			WriterInfo* winfo = i->second;
 
-			if ( winfo->writer == writer )
+			if ( winfo && winfo->writer == writer )
 				return winfo;
 			}
 		}
@@ -1506,7 +1506,8 @@ bool LogMgr::FinishedRotation(LogWriter* writer, string new_name, string old_nam
 		writer->Path().c_str(), network_time, new_name.c_str());
 
 	WriterInfo* winfo = FindWriter(writer);
-	assert(winfo);
+	if ( ! winfo )
+		return true;
 
 	RecordVal* rc =
 		LookupRotationControl(winfo->type, winfo->writer->Path());