diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index 5d23e1b648..a4f177246d 100644
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -3510,6 +3510,10 @@ Modifications *slapi_int_ldapmods2modifications (LDAPMod **mods)
 	Modifications *modlist = NULL, **modtail;
 	LDAPMod **modp;
 
+	if ( mods == NULL ) {
+		return NULL;
+	}
+
 	modtail = &modlist;
 
 	for( modp = mods; *modp != NULL; modp++ ) {