diff --git a/CHANGES b/CHANGES
index 59da465a0f..8825d9ee69 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ OpenLDAP 2.0.X Engineering
 	Fixed slapd idletimeout lock bug (ITS#767)
 	Fixed slapd caseIgnoreIA5string indexing bug (ITS#786)
 	Fixed slurpd TLS initialization bug (ITS#768)
+	Fixed -lldap SASL ctx close bug (ITS#790)
 	Updated -llber bprint routine
 	Build Environment
 		Fixed VPATH schema install
diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index f0f8875b5e..9908505699 100644
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -326,8 +326,10 @@ int ldap_pvt_sasl_install( Sockbuf *sb, void *ctx_arg )
 
 	if ( !ber_sockbuf_ctrl( sb, LBER_SB_OPT_HAS_IO,
 			&ldap_pvt_sockbuf_io_sasl ) )
+	{
 		ber_sockbuf_add_io( sb, &ldap_pvt_sockbuf_io_sasl,
 			LBER_SBIOD_LEVEL_APPLICATION, ctx_arg );
+	}
 
 	return LDAP_SUCCESS;
 }
@@ -436,9 +438,8 @@ ldap_int_sasl_open(
 int ldap_int_sasl_close( LDAP *ld, LDAPConn *lc )
 {
 	sasl_conn_t *ctx = lc->lconn_sasl_ctx;
-	assert( ctx != NULL );
 
-	if( ctx ) {
+	if( ctx != NULL ) {
 		sasl_dispose( &ctx );
 		lc->lconn_sasl_ctx = NULL;
 	}