diff --git a/manifest.json b/manifest.json
index ab777ac..5707b1d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -11,7 +11,7 @@
                 "group": "sdk"
             },
             "runMode": "respawn",
-            "version": "1.2.4"
+            "version": "1.2.5"
         },
         "configuration": {
             "paramConfig": [
diff --git a/opcua_server.c b/opcua_server.c
index 31d000b..72e8ae4 100644
--- a/opcua_server.c
+++ b/opcua_server.c
@@ -356,14 +356,14 @@ static gboolean signal_handler_init(void)
 
 int main(int argc, char **argv)
 {
+    char *app_name = basename(argv[0]);
+    open_syslog(app_name);
+
     if (!signal_handler_init())
     {
-        return -1;
+        return EXIT_FAILURE;
     }
 
-    char *app_name = basename(argv[0]);
-    open_syslog(app_name);
-
     // Setup D-Bus
     LOG_I("%s/%s: Setup D-Bus", __FILE__, __FUNCTION__);
     if (!dbus_all_init())
@@ -412,5 +412,5 @@ int main(int argc, char **argv)
     LOG_I("%s/%s: Closing syslog ...", __FILE__, __FUNCTION__);
     close_syslog();
 
-    return 0;
+    return EXIT_SUCCESS;
 }