diff --git a/scheme/conditions.scm b/scheme/conditions.scm
index 3004cc3..77cef20 100644
--- a/scheme/conditions.scm
+++ b/scheme/conditions.scm
@@ -178,56 +178,56 @@
 
 (define raise-ldap-condition
   (let ((alist
-	 `(((ldap-return operations-error)		,&ldap-operations-error)
-	  ((ldap-return protocol-error)			,&ldap-protocol-error)
-	  ((ldap-return timelimit-exceeded)		,&ldap-timelimit-exceeded)
-	  ((ldap-return sizelimit-exceeded)		,&ldap-sizelimit-exceeded)
-	  ((ldap-return strong-auth-not-supported)	,&ldap-strong-auth-not-supported)
-	  ((ldap-return strong-auth-required)		,&ldap-strong-auth-required)
-	  ((ldap-return adminlimit-exceeded)		,&ldap-adminlimit-exceeded)
-	  ((ldap-return unavailable-critical-extension) ,&ldap-critical-extension-unavailable)
-	  ((ldap-return confidentiality-required)	,&ldap-confidentiality-required)
-	  ((ldap-return sasl-bind-in-progress)		,&ldap-sasl-bind-in-progress)
-	  ((ldap-return no-such-attribute)		,&ldap-no-such-attribute)
-	  ((ldap-return undefined-type)			,&ldap-undefined-type)
-	  ((ldap-return inappropriate-type)		,&ldap-inappropriate-type)
-	  ((ldap-return constraint-violation)		,&ldap-constraint-violation)
-	  ((ldap-return type-or-value-exists)		,&ldap-type-or-value-exists)
-	  ((ldap-return invalid-syntax)			,&ldap-invalid-syntax)
-	  ((ldap-return no-such-object)			,&ldap-no-such-object)
-	  ((ldap-return alias-problem)			,&ldap-alias-problem)
-	  ((ldap-return invalid-dn-syntax)		,&ldap-invalid-dn-syntax)
-	  ((ldap-return is-leaf)			,&ldap-not-allowed-on-leaf)
-	  ((ldap-return alias-deref-problem)		,&ldap-alias-deref-problem)
-	  ((ldap-return inappropriate-auth)		,&ldap-auth-unknown)
-	  ((ldap-return invalid-credentials)		,&ldap-invalid-credentials)
-	  ((ldap-return insufficient-access)		,&ldap-insufficient-access)
-	  ((ldap-return busy)				,&ldap-busy)
-	  ((ldap-return unavailable)			,&ldap-unavailable)
-	  ((ldap-return unwilling-to-perform)		,&ldap-unwilling-to-perform)
-	  ((ldap-return loop-detect)			,&ldap-loop-detect)
-	  ((ldap-return naming-violation)		,&ldap-naming-violation)
-	  ((ldap-return object-class-violation)		,&ldap-objectclass-violation)
-	  ((ldap-return not-allowed-on-leaf)		,&ldap-not-allowed-on-leaf)
-	  ((ldap-return not-allowed-on-rdn)		,&ldap-not-allowed-on-rdn)
-	  ((ldap-return already-exists)			,&ldap-already-exists)
-	  ((ldap-return no-object-class-mods)		,&ldap-no-objectclass-mods)
-	  ((ldap-return results-too-large)		,&ldap-results-too-large)
-	  ((ldap-return affects-multiple-dsas)		,&ldap-affects-multiple-dsas)
-	  ((ldap-return other)				,&ldap-error)
-	  ((ldap-return server-down)			,&ldap-server-down)
-	  ((ldap-return local-error)			,&ldap-local-error)
-	  ((ldap-return encoding-error)			,&ldap-encoding-error)
-	  ((ldap-return decoding-error)			,&ldap-decoding-error)
-	  ((ldap-return timeout)			,&ldap-timeout-error)
-	  ((ldap-return auth-unknown)			,&ldap-auth-unknown)
-	  ((ldap-return filter-error)			,&ldap-filter-error)
-	  ((ldap-return param-error)			,&ldap-param-error)
-	  ((ldap-return no-memory)			,&ldap-no-memory)
-	  ((ldap-return connect-error)			,&ldap-connect-error)
-	  ((ldap-return not-supported)			,&ldap-not-supported)
-	  ((ldap-return control-not-found)		,&ldap-control-not-found)
-	  ((ldap-return referral-limit-exceeded)	,&ldap-referral-limit-exceeded))))
+	 `((,(ldap-return operations-error)		,&ldap-operations-error)
+	   (,(ldap-return protocol-error)		,&ldap-protocol-error)
+	   (,(ldap-return timelimit-exceeded)		,&ldap-timelimit-exceeded)
+	   (,(ldap-return sizelimit-exceeded)		,&ldap-sizelimit-exceeded)
+	   (,(ldap-return strong-auth-not-supported)	,&ldap-strong-auth-not-supported)
+	   (,(ldap-return strong-auth-required)		,&ldap-strong-auth-required)
+	   (,(ldap-return adminlimit-exceeded)		,&ldap-adminlimit-exceeded)
+	   (,(ldap-return unavailable-critical-extension) ,&ldap-critical-extension-unavailable)
+	   (,(ldap-return confidentiality-required)	,&ldap-confidentiality-required)
+	   (,(ldap-return sasl-bind-in-progress)	,&ldap-sasl-bind-in-progress)
+	   (,(ldap-return no-such-attribute)		,&ldap-no-such-attribute)
+	   (,(ldap-return undefined-type)		,&ldap-undefined-type)
+;	   (,(ldap-return inappropriate-type)		,&ldap-inappropriate-type)
+	   (,(ldap-return constraint-violation)		,&ldap-constraint-violation)
+	   (,(ldap-return type-or-value-exists)		,&ldap-type-or-value-exists)
+	   (,(ldap-return invalid-syntax)		,&ldap-invalid-syntax)
+	   (,(ldap-return no-such-object)		,&ldap-no-such-object)
+	   (,(ldap-return alias-problem)		,&ldap-alias-problem)
+	   (,(ldap-return invalid-dn-syntax)		,&ldap-invalid-dn-syntax)
+	   (,(ldap-return is-leaf)			,&ldap-not-allowed-on-leaf)
+	   (,(ldap-return alias-deref-problem)		,&ldap-alias-deref-problem)
+	   (,(ldap-return inappropriate-auth)		,&ldap-auth-unknown)
+	   (,(ldap-return invalid-credentials)		,&ldap-invalid-credentials)
+	   (,(ldap-return insufficient-access)		,&ldap-insufficient-access)
+	   (,(ldap-return busy)				,&ldap-busy)
+	   (,(ldap-return unavailable)			,&ldap-unavailable)
+	   (,(ldap-return unwilling-to-perform)		,&ldap-unwilling-to-perform)
+	   (,(ldap-return loop-detect)			,&ldap-loop-detect)
+	   (,(ldap-return naming-violation)		,&ldap-naming-violation)
+	   (,(ldap-return object-class-violation)	,&ldap-objectclass-violation)
+;	   (,(ldap-return not-allowed-on-leaf)		,&ldap-not-allowed-on-leaf)
+	   (,(ldap-return not-allowed-on-rdn)		,&ldap-not-allowed-on-rdn)
+	   (,(ldap-return already-exists)		,&ldap-already-exists)
+	   (,(ldap-return no-object-class-mods)		,&ldap-no-objectclass-mods)
+	   (,(ldap-return results-too-large)		,&ldap-results-too-large)
+	   (,(ldap-return affects-multiple-dsas)	,&ldap-affects-multiple-dsas)
+	   (,(ldap-return other)			,&ldap-error)
+	   (,(ldap-return server-down)			,&ldap-server-down)
+	   (,(ldap-return local-error)			,&ldap-local-error)
+	   (,(ldap-return encoding-error)		,&ldap-encoding-error)
+	   (,(ldap-return decoding-error)		,&ldap-decoding-error)
+	   (,(ldap-return timeout)			,&ldap-timeout-error)
+	   (,(ldap-return auth-unknown)			,&ldap-auth-unknown)
+	   (,(ldap-return filter-error)			,&ldap-filter-error)
+	   (,(ldap-return param-error)			,&ldap-param-error)
+	   (,(ldap-return no-memory)			,&ldap-no-memory)
+	   (,(ldap-return connect-error)		,&ldap-connect-error)
+	   (,(ldap-return not-supported)		,&ldap-not-supported)
+	   (,(ldap-return control-not-found)		,&ldap-control-not-found)
+	   (,(ldap-return referral-limit-exceeded)	,&ldap-referral-limit-exceeded))))
     (lambda (return-object session)
       (cond 
        ((assoc return-object alist)