diff -up ntp-4.2.6p5/ntpd/ntp_request.c.cve-2016-2516 ntp-4.2.6p5/ntpd/ntp_request.c
--- ntp-4.2.6p5/ntpd/ntp_request.c.cve-2016-2516	2016-04-27 12:42:48.879803829 +0200
+++ ntp-4.2.6p5/ntpd/ntp_request.c	2016-04-27 12:42:57.112829645 +0200
@@ -1626,11 +1626,13 @@ do_unconf(
 			if (peer->flags & FLAG_CONFIG)
 				found = 1;
 		}
-		NTP_INSIST(found);
-		NTP_INSIST(peer);
 
-		peer_clear(peer, "GONE");
-		unpeer(peer);
+		if (found) {
+			NTP_INSIST(peer);
+
+			peer_clear(peer, "GONE");
+			unpeer(peer);
+		}
 
 		cp = (struct conf_unpeer *)
 			((char *)cp + INFO_ITEMSIZE(inpkt->mbz_itemsize));