refactor: replace .lock().unwrap() with .expect() for better error me…

refactor: replace .lock().unwrap() with .expect() for better error me… #1768