diff --git a/servers/slapd/tools/slapcommon.c b/servers/slapd/tools/slapcommon.c
index ddf2124f9c..73fabc76bb 100644
--- a/servers/slapd/tools/slapcommon.c
+++ b/servers/slapd/tools/slapcommon.c
@@ -412,7 +412,10 @@ slap_tool_init(
 	mal_leaktrace(1);
 #endif
 
-	slap_startup( be );
+	if ( slap_startup( be ) ) {
+		fprintf( stderr, "slap_startup failed\n" );
+		exit( EXIT_FAILURE );
+	}
 }
 
 void slap_tool_destroy( void )