diff --git a/CHANGES b/CHANGES
index 92b8384412..4f419d915e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ OpenLDAP 2.2.20 Engineering
 	Fixed slapd ID to DN mapping when values need DN escaping (ITS#3419)
 	Fixed slapd sl_realloc memory overrun (ITS#3420, #3404, #3296)
 	Fixed slapd syncrepl bugs (ITS#3423, #3425, #3443, #3448)
+	Fixed slapd bad tag handling
 	Fixed back-bdb locks in backend_group (ITS#3263, #3365)
 	Fixed back-bdb/back-hdb listing of permissive control (ITS#3453)
 	Fixed back-ldap failed connection retry (ITS#3217)
diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 550c4e05cc..8e03b7e65c 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1140,8 +1140,11 @@ operations_error:
 		num_ops_completed_[SLAP_OP_EXTENDED]++;
 		break;
 	default:
+		/* this is reachable */
+#if 0
 		/* not reachable */
 		assert( 0 );
+#endif
 	}
 #endif /* SLAPD_MONITOR */
 	ldap_pvt_thread_mutex_unlock( &num_ops_mutex );