diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 8d02684c1a..eaa0c77375 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -5818,6 +5818,8 @@ config_modify_internal( CfEntryInfo *ce, Operation *op, SlapReply *rs,
 			/* FALLTHRU: LDAP_MOD_REPLACE && vals */
 
 		case LDAP_MOD_ADD:
+			if ( !a )
+				break;
 			for (i=0; ml->sml_values[i].bv_val; i++) {
 				ca->line = ml->sml_values[i].bv_val;
 				ca->valx = -1;