diff --git a/ldapvi/ldapvi.c b/ldapvi/ldapvi.c
index b594327..44c04e2 100644
--- a/ldapvi/ldapvi.c
+++ b/ldapvi/ldapvi.c
@@ -716,18 +716,18 @@ do_connect(char *server, bind_options *bind_options,
 		server = url;
 	}
 
-	if (ldap_set_option(0, LDAP_OPT_X_TLS_REQUIRE_CERT, (void *) &tls))
-		ldaperr(0, "ldap_set_option(LDAP_OPT_X_TLS)");
 	if ( rc = ldap_initialize(&ld, server)) {
 		fprintf(stderr, "ldap_initialize: %s\n", ldap_err2string(rc));
 		exit(1);
 	}
+	if (LDAP_OPT_SUCCESS != ldap_set_option(ld, LDAP_OPT_X_TLS_REQUIRE_CERT, (void *) &tls))
+		ldaperr(ld, "ldap_set_option(LDAP_OPT_X_TLS)");
 	if (!profileonlyp)
 		init_sasl_arguments(ld, bind_options);
-	if (ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &drei))
+	if (LDAP_OPT_SUCCESS != ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &drei))
 		ldaperr(ld, "ldap_set_option(LDAP_OPT_PROTOCOL_VERSION)");
 	if (starttls)
-		if (ldap_start_tls_s(ld, 0, 0))
+		if (LDAP_SUCCESS != ldap_start_tls_s(ld, 0, 0))
 			ldaperr(ld, "ldap_start_tls_s");
 	if (rebind(ld, bind_options, 1, dir, 0) == -1) {
 		ldap_unbind_s(ld);
@@ -736,10 +736,10 @@ do_connect(char *server, bind_options *bind_options,
 	/* after initial bind, always ask interactively (except in '!' rebinds,
 	 * which are special-cased): */
 	bind_options->dialog = BD_ALWAYS;
-	if (ldap_set_option(ld, LDAP_OPT_REFERRALS,
+	if (LDAP_OPT_SUCCESS != ldap_set_option(ld, LDAP_OPT_REFERRALS,
                             referrals ? LDAP_OPT_ON : LDAP_OPT_OFF))
 		ldaperr(ld, "ldap_set_option(LDAP_OPT_REFERRALS)");
-	if (ldap_set_option(ld, LDAP_OPT_DEREF, (void *) &deref))
+	if (LDAP_OPT_SUCCESS != ldap_set_option(ld, LDAP_OPT_DEREF, (void *) &deref))
 		ldaperr(ld, "ldap_set_option(LDAP_OPT_DEREF)");
 
 	return ld;