diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index da339a55e8..e43c685794 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -354,8 +354,8 @@ slap_find_control_id(
 	int *cid )
 {
 	slap_control *ctrl = find_ctrl( oid );
-	if ( ctrl && cid ) {
-		*cid = ctrl->sc_cid;
+	if ( ctrl ) {
+		if ( cid ) *cid = ctrl->sc_cid;
 		return LDAP_SUCCESS;
 	}
 	return LDAP_CONTROL_NOT_FOUND;