diff --git a/libs/freetdm/src/zap_io.c b/libs/freetdm/src/zap_io.c
index 122397bcd2..51c7a2e813 100644
--- a/libs/freetdm/src/zap_io.c
+++ b/libs/freetdm/src/zap_io.c
@@ -212,7 +212,7 @@ OZ_DECLARE_DATA zap_logger_t zap_log = null_logger;
 
 OZ_DECLARE(void) zap_global_set_crash_policy(zap_crash_policy_t policy)
 {
-	g_zap_crash_policy = policy;
+	g_zap_crash_policy |= policy;
 }
 
 OZ_DECLARE(zap_status_t) zap_global_set_memory_handler(zap_memory_handler_t *handler)
diff --git a/libs/freetdm/src/zap_threadmutex.c b/libs/freetdm/src/zap_threadmutex.c
index fa4691d03c..4d19933b9e 100644
--- a/libs/freetdm/src/zap_threadmutex.c
+++ b/libs/freetdm/src/zap_threadmutex.c
@@ -239,7 +239,7 @@ OZ_DECLARE(zap_status_t) zap_condition_create(zap_condition_t **incondition, zap
 {
 	zap_condition_t *condition = NULL;
 
-	zap_assert(condition != NULL, ZAP_FAIL, "Condition double pointer is null!\n");
+	zap_assert(incondition != NULL, ZAP_FAIL, "Condition double pointer is null!\n");
 	zap_assert(mutex != NULL, ZAP_FAIL, "Mutex for condition must not be null!\n");
 
 	condition = zap_calloc(1, sizeof(*condition));