diff --git a/src/commit.rs b/src/commit.rs
index f05e8d9..ba9701c 100644
--- a/src/commit.rs
+++ b/src/commit.rs
@@ -1,5 +1,5 @@
 use std::{
-    collections::HashMap,
+    collections::{HashMap, HashSet},
     sync::{Mutex, MutexGuard, OnceLock},
 };
 
@@ -14,7 +14,6 @@ use sdk_common::sp_client::spclient::Recipient;
 use sdk_common::network::{AnkFlag, CommitMessage, HandshakeMessage};
 use sdk_common::sp_client::bitcoin::{Amount, OutPoint};
 use sdk_common::process::{lock_processes, Process, ProcessState};
-use serde_json::json;
 
 use crate::message::{broadcast_message, BroadcastType};
 use crate::{lock_freezed_utxos, MutexExt, DAEMON, STORAGE, WALLET};
@@ -133,14 +132,13 @@ fn handle_member_list(roles: &HashMap<String, RoleDefinition>, process_id: OutPo
 
     if let Some(pairing_role) = roles.get("pairing") {
         if pairing_role.members.len() == 1 {
-            let member = pairing_role.members.get(0).unwrap();
-            let mut memberlist = lock_members()?;
-            memberlist.insert(
-                process_id,
-                member.to_owned(),
-            );
-
-            return Ok(process_id);
+            if let Some(member) = pairing_role.members.get(0) {
+                let mut memberlist = lock_members()?;
+                memberlist.insert(
+                    process_id, 
+                    member.to_owned());
+                return Ok(process_id);
+            }
         }
     }
 
@@ -221,7 +219,7 @@ fn register_new_state(process: &mut Process, commit_msg: &CommitMessage) -> Resu
         .iter()
         .any(|state| state.state_id == new_state_id)
     {
-        return Err(Error::msg("Can't add an already existing state"));
+        return Err(Error::msg(format!("{}", new_state_id)));
     }
 
     // Add the new state