diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 249f1b82cb954099fee6b4ab2e21c7af90f94181..1d772edcf2740ff67f93fb2980f225049f3a529c 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -202,8 +202,9 @@ connection_activity(
 	active_threads++;
 	ldap_pvt_thread_mutex_unlock( &active_threads_mutex );
 
-	if ( status = ldap_pvt_thread_create( &arg->co_op->o_tid, 1,
-	    connection_operation, (void *) arg ) != 0 ) {
+	status = ldap_pvt_thread_create( &arg->co_op->o_tid, 1,
+					 connection_operation, (void *) arg );
+	if ( status != 0 ) {
 		Debug( LDAP_DEBUG_ANY, "ldap_pvt_thread_create failed (%d)\n", status, 0, 0 );
 	}
 }
diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 16b3e2cf2b1348e7c928c79927a9c8fd403305a9..f4ca8a58b052680100340f48a672a68f7db3bc24 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -220,8 +220,9 @@ main( int argc, char **argv )
 
 		time( &starttime );
 
-		if ( status = ldap_pvt_thread_create( &listener_tid, 0,
-			slapd_daemon, (void *) port ) != 0 )
+		status = ldap_pvt_thread_create( &listener_tid, 0,
+						 slapd_daemon, (void *) port );
+		if ( status != 0 )
 		{
 			Debug( LDAP_DEBUG_ANY,
 			    "listener ldap_pvt_thread_create failed (%d)\n", status, 0, 0 );