diff --git a/contrib/init/teosd.service b/contrib/init/teosd.service
index 2fef183..2a37ccd 100644
--- a/contrib/init/teosd.service
+++ b/contrib/init/teosd.service
@@ -1,8 +1,9 @@
 [Unit]
 Description=The Eye of Satoshi daemon
-After=bitcoind.service network.target
 Requires=bitcoind.service
-Wants=network.target
+After=bitcoind.service 
+Wants=network-online.target
+After=network-online.target
 
 [Service]
 ExecStart=/home/teos/.cargo/bin/teosd
diff --git a/teos/src/main.rs b/teos/src/main.rs
index 1986310..023eb28 100644
--- a/teos/src/main.rs
+++ b/teos/src/main.rs
@@ -158,7 +158,7 @@ async fn main() {
                 _ => e.to_string(),
             };
             log::error!("Failed to connect to bitcoind. Error: {}", e_msg);
-            return;
+            std::process::exit(1);
         }
     };