diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 8f1bd67ebc..0dd04d75c7 100644
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -502,6 +502,10 @@ oc_next( ObjectClass **oc )
 	}
 #endif
 
+	if ( *oc == NULL ) {
+		return 0;
+	}
+
 	*oc = LDAP_STAILQ_NEXT(*oc,soc_next);
 
 	return (*oc != NULL);