2 files changed, 5 insertions, 3 deletions
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 97df24e7d4..d9df085654 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -850,7 +850,7 @@ impl Drop for Daemon {
 
 
 fn main() {
-    ::std::process::exit(match run() {
+    let exit_code = match run() {
         Ok(_) => 0,
         Err(error) => {
             if let &ErrorKind::LogError(_) = error.kind() {
@@ -860,7 +860,9 @@ fn main() {
             }
             1
         }
-    });
+    };
+    debug!("Process exiting with code {}", exit_code);
+    ::std::process::exit(exit_code);
 }
 
 fn run() -> Result<()> {
diff --git a/mullvad-daemon/src/system_service.rs b/mullvad-daemon/src/system_service.rs
index 56e6ea8f94..6c2098b1ce 100644
--- a/mullvad-daemon/src/system_service.rs
+++ b/mullvad-daemon/src/system_service.rs
@@ -38,7 +38,7 @@ pub fn handle_service_main(arguments: Vec<OsString>) {
     info!("Service started.");
     match run_service(arguments) {
         Ok(_) => info!("Service stopped."),
-        Err(ref e) => error!("Service stopped with error: {}", e.display_chain()),
+        Err(ref e) => error!("{}", e.display_chain()),
     };
 }