diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 32bb691db3..137b7244cb 100644
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -347,8 +347,10 @@ slap_auxprop_lookup(
 	}
 
 	/* we don't know anything about this, ignore it */
-	if ( !conn )
-		return SASL_OK;
+	if ( !conn ) {
+		rc == LDAP_SUCCESS;
+		goto done;
+	}
 
 	/* Now see what else needs to be fetched */
 	for( i = 0; sl.list[i].name; i++ ) {
@@ -503,6 +505,7 @@ retry_dontUseCopy:;
 			}
 		}
 	}
+done:;
 #if SASL_VERSION_FULL >= 0x020118
 	return rc != LDAP_SUCCESS ? SASL_FAIL : SASL_OK;
 #endif