diff --git a/src/main.rs b/src/main.rs
index b624a99..b38a542 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -75,29 +75,53 @@ fn main() {
         Commands::Set { members, discord, fedi } => {
             res = set_member(config_path.clone(), members);
 
-            #[cfg(feature = "avatar")]
-            let _ = update_avatars(config_path.clone(), discord, fedi);
+            #[cfg(feature = "avatar")] {
+                match res {
+                    Ok(_) => {
+                        let _ = update_avatars(config_path.clone(), discord, fedi);
+                    },
+                    Err(_) => (),
+                }
+            }
         },
         #[cfg(all(feature = "discord", not(feature = "fedi")))]
         Commands::Set { members, discord } => {
             res = set_member(config_path.clone(), members);
 
-            #[cfg(feature = "avatar")]
-            let _ = update_avatars(config_path.clone(), discord, false);
+            #[cfg(feature = "avatar")] {
+                match res {
+                    Ok(_) => {
+                        let _ = update_avatars(config_path.clone(), discord, false);
+                    },
+                    Err(_) => (),
+                }
+            }
         },
         #[cfg(all(not(feature = "discord"), feature = "fedi"))]
         Commands::Set { members, fedi} => {
             res = set_member(config_path.clone(), members);
 
-            #[cfg(feature = "avatar")]
-            let _ = update_avatars(config_path.clone(), false, fedi);
+            #[cfg(feature = "avatar")] {
+                match res {
+                    Ok(_) => {
+                        let _ = update_avatars(config_path.clone(), false, fedi);
+                    },
+                    Err(_) => (),
+                }
+            }
         },
         #[cfg(all(not(feature = "discord"), not(feature = "fedi")))]
         Commands::Set { members } => {
             res = set_member(config_path.clone(), members);
 
-            #[cfg(feature = "avatar")]
-            let _ = update_avatars(config_path.clone(), false, false);
+            #[cfg(feature = "avatar")] {
+                match res {
+                    Ok(_) => {
+                        let _ = update_avatars(config_path.clone(), false, false);
+                    },
+                    Err(_) => (),
+                }
+            }
         },
 
         // ADD MEMBER
@@ -105,29 +129,53 @@ fn main() {
         Commands::Add { members, discord, fedi } => {
             res = add_member(config_path.clone(), members);
 
-            #[cfg(feature = "avatar")]
-            let _ = update_avatars(config_path.clone(), discord, fedi);
+            #[cfg(feature = "avatar")] {
+                match res {
+                    Ok(_) => {
+                        let _ = update_avatars(config_path.clone(), discord, fedi);
+                    },
+                    Err(_) => (),
+                }
+            }
         },
         #[cfg(all(feature = "discord", not(feature = "fedi")))]
         Commands::Add { members, discord } => {
             res = add_member(config_path.clone(), members);
 
-            #[cfg(feature = "avatar")]
-            let _ = update_avatars(config_path.clone(), discord, false);
+            #[cfg(feature = "avatar")] {
+                match res {
+                    Ok(_) => {
+                        let _ = update_avatars(config_path.clone(), discord, false);
+                    },
+                    Err(_) => (),
+                }
+            }
         },
         #[cfg(all(not(feature = "discord"), feature = "fedi"))]
         Commands::Add { members, fedi} => {
             res = add_member(config_path.clone(), members);
 
-            #[cfg(feature = "avatar")]
-            let _ = update_avatars(config_path.clone(), false, fedi);
+            #[cfg(feature = "avatar")] {
+                match res {
+                    Ok(_) => {
+                        let _ = update_avatars(config_path.clone(), false, fedi);
+                    },
+                    Err(_) => (),
+                }
+            }
         },
         #[cfg(all(not(feature = "discord"), not(feature = "fedi")))]
         Commands::Add { members } => {
             res = add_member(config_path.clone(), members);
 
-            #[cfg(feature = "avatar")]
-            let _ = update_avatars(config_path.clone(), false, false);
+            #[cfg(feature = "avatar")] {
+                match res {
+                    Ok(_) => {
+                        let _ = update_avatars(config_path.clone(), false, false);
+                    },
+                    Err(_) => (),
+                }
+            }
         },
 
         // Get MEMBER
@@ -270,6 +318,7 @@ fn set_member(config_path: String, tf_members: Vec<String>) -> Result<(), &'stat
         println!("One or more members were not found. Known members:\n--------------------------");
         let _ = memberlist(config_path);
         println!("--------------------------\nIf a member is missing from the system try running \"pluralsync sync\" to refresh the local database");
+        return Err("Missing member");
     }
     Ok(())
 }
@@ -307,6 +356,7 @@ fn add_member(config_path: String, tf_members: Vec<String>) -> Result<(), &'stat
         println!("One or more members were not found. Known members:\n--------------------------");
         let _ = memberlist(config_path);
         println!("--------------------------\nIf a member is missing from the system try running \"pluralsync sync\" to refresh the local database");
+        return Err("Missing member");
     }
     Ok(())
 }