diff --git a/CHANGES b/CHANGES
index cb6da21a16..be5bba6821 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2204	[bug]		"rndc flushanme name unknown-view" caused named
+			to crash. [RT #16984]
 
 	--- 9.5.0a6 released ---
 
diff --git a/bin/named/server.c b/bin/named/server.c
index 2e9156062e..39f00900ca 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.487 2007/06/25 02:37:25 marka Exp $ */
+/* $Id: server.c,v 1.488 2007/07/02 01:00:35 marka Exp $ */
 
 /*! \file */
 
@@ -4960,7 +4960,7 @@ ns_server_flushname(ns_server_t *server, char *args) {
 				      NS_LOGMODULE_SERVER, ISC_LOG_ERROR,
 				      "flushing name '%s' in cache view '%s' "
 				      "failed: view not found", target,
-				      view->name);
+				      viewname);
 		result = ISC_R_FAILURE;
 	}
 	isc_task_endexclusive(server->task);