diff --git a/CHANGES b/CHANGES
index 877e4a0488..19238ae0e7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2299.	[bug]		Remove unnecessary NULL check in
+			bin/nsupdate/nsupdate.c. [RT #17475]
+
 2298.	[bug]		isc_mutex_lock() failure not caught in
 			bin/tests/timers/t_timers.c. [RT #17468]
 
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index ce53b2a3db..997e55b6be 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.154 2007/09/16 02:37:12 marka Exp $ */
+/* $Id: nsupdate.c,v 1.154.56.1 2008/01/12 22:16:49 marka Exp $ */
 
 /*! \file */
 
@@ -1586,8 +1586,7 @@ update_addordelete(char *cmdline, isc_boolean_t isdelete) {
  failure:
 	if (name != NULL)
 		dns_message_puttempname(updatemsg, &name);
-	if (rdata != NULL)
-		dns_message_puttemprdata(updatemsg, &rdata);
+	dns_message_puttemprdata(updatemsg, &rdata);
 	return (STATUS_SYNTAX);
 }