Only log if ns0 generation returns a status code (after bootstrap)

src/server/ua_server.c

@@ -274,8 +274,8 @@ UA_Server_new(const UA_ServerConfig *config) {
     UA_StatusCode retVal = UA_Server_initNS0(server);
     if(retVal != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(config->logger, UA_LOGCATEGORY_SERVER,
-                     "Initialization of Namespace 0 failed with %s. "
-                     "See previous outputs for any error messages.",
+                     "Namespace 0 could not be bootstrapped with error %s. "
+                     "Shutting down the server.",
                      UA_StatusCode_name(retVal));
         UA_Server_delete(server);
         return NULL;

src/server/ua_server_ns0.c

@@ -557,8 +557,6 @@ UA_Server_initNS0(UA_Server *server) {
     server->bootstrapNS0 = true;
     retVal = ua_namespace0(server);
     server->bootstrapNS0 = false;
-    if(retVal != UA_STATUSCODE_GOOD)
-        return retVal;
 
     /* NamespaceArray */
     UA_DataSource namespaceDataSource = {readNamespaces, NULL};
@@ -740,5 +738,11 @@ UA_Server_initNS0(UA_Server *server) {
     retVal |= UA_Server_setMethodNode_callback(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_GETMONITOREDITEMS), readMonitoredItems);
 #endif
-    return retVal;
+
+    if(retVal != UA_STATUSCODE_GOOD)
+        UA_LOG_ERROR(server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "Initialization of Namespace 0 (after bootstrapping) "
+                     "failed with %s. See previous outputs for any error messages.",
+                     UA_StatusCode_name(retVal));
+    return UA_STATUSCODE_GOOD;
 }