diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index c4d65cfd61..d361d91df5 100644
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -365,6 +365,10 @@ at_next( AttributeType **at )
 	}
 #endif
 
+	if ( *at == NULL ) {
+		return 0;
+	}
+
 	*at = LDAP_STAILQ_NEXT(*at,sat_next);
 
 	return (*at != NULL);