diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 7c18f43c4a..692d4fbe4f 100644
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -87,6 +87,7 @@ do_modify(
 			free( dn );
 			free( odn );
 			free( *modtail );
+			*modtail = NULL;
 			modlist_free( modlist );
 			return;
 		}