diff --git a/hyprman/src/main.rs b/hyprman/src/main.rs
index 2e4da0f..1ff4563 100644
--- a/hyprman/src/main.rs
+++ b/hyprman/src/main.rs
@@ -2,14 +2,32 @@ use std::env;
 use std::io::Read;
 use std::os::unix::net::UnixStream;
 
-fn main() {
-    let mut socket2_path: String = env::var("XDG_RUNTIME_DIR").unwrap();
-    socket2_path.push_str("/hypr/");
-    socket2_path.push_str(&*env::var("HYPRLAND_INSTANCE_SIGNATURE").unwrap());
-    socket2_path.push_str("/.socket2.sock");
-    let mut stream = UnixStream::connect(socket2_path).unwrap();
-    println!("Connected to socket2: {:?}", stream.local_addr());
-    let mut line = String::new();
-    stream.read_to_string(&mut line).unwrap();
-    println!("{line}");
+fn create_socket(socket_path : String) -> UnixStream {
+    return match UnixStream::connect(socket_path){
+        Ok(socket) => {
+            println!("Connected to socket: {:?}", socket.peer_addr());
+            socket
+        },
+        Err(error) => panic!("Could not connect to socket: {}", error),
+    };
+}
+fn main() {
+    let env_var_xdg_runtime_dir = "XDG_RUNTIME_DIR";
+    let env_var_hyprland_instance_signature = "HYPRLAND_INSTANCE_SIGNATURE";
+    let mut hypr_rundir_path: String = match env::var(env_var_xdg_runtime_dir){
+        Ok(path) => path,
+        Err(_e) => panic!("XDG_RUNTIME_DIR is not set."),
+    };
+    hypr_rundir_path.push_str("/hypr/");
+    hypr_rundir_path.push_str(&*match env::var(env_var_hyprland_instance_signature){
+        Ok(path) => path,
+        Err(_e) => panic!("HYPRLAND_INSTANCE_SIGNATURE is not set. Hyprland running?"),
+    });
+    println!("Using hypr runtime directory: {}", hypr_rundir_path);
+    let socket1_path = format!("{}/.socket.sock", hypr_rundir_path);
+    let socket2_path = format!("{}/.socket2.sock", hypr_rundir_path);
+    println!("Using socket1 path: {}", socket1_path);
+    println!("Using socket2 path: {}", socket2_path);
+    let mut socket1 = create_socket(socket1_path);
+    let mut socket2= create_socket(socket2_path);
 }