diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index 3a8ddd9c1d..94cbeac0cf 100644
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -321,13 +321,17 @@ slap_passwd_hash(
 #endif
 
 	tmp = lutil_passwd_hash( cred , hash );
-	assert( tmp != NULL );
 	
 #if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
 	ldap_pvt_thread_mutex_unlock( &passwd_mutex );
 #endif
+
+	if( tmp == NULL ) {
+		new->bv_len = 0;
+		new->bv_val = NULL;
+	}
+
 	*new = *tmp;
 	free( tmp );
-
 	return;
 }