diff --git a/Cargo.toml b/Cargo.toml
index 3398b1f..ee31f01 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 music = ["serenity/voice"]
 
 [dependencies]
-serenity = { version = "0.9.0-rc.1" }
+serenity = { version = "0.9.0-rc.2" }
 toml = "0.5.6"
 serde = { version = "1.0", features = ["derive"] }
 reqwest = "0.10.7"
diff --git a/src/commands/admin.rs b/src/commands/admin.rs
index fc92662..dd4610b 100644
--- a/src/commands/admin.rs
+++ b/src/commands/admin.rs
@@ -17,8 +17,8 @@ pub struct Admin;
 #[only_in(guilds)]
 #[required_permissions("KICK_MEMBERS")]
 async fn kick(ctx: &Context, msg: &Message) -> CommandResult {
-    // TODO CACHE ?
-    if let Some(sender_member) = msg.member(ctx).await {
+    // TODO CACHE ? + error message
+    if let Ok(sender_member) = msg.member(ctx).await {
         for user in &msg.mentions {
             if let Some(member) = ctx.cache.member(msg.guild_id.unwrap(), user.id).await {
                 debugln!("Kicking {:?}", user);
@@ -59,8 +59,8 @@ async fn kick(ctx: &Context, msg: &Message) -> CommandResult {
 #[only_in(guilds)]
 #[required_permissions("BAN_MEMBERS")]
 async fn ban(ctx: &Context, msg: &Message) -> CommandResult {
-    // TODO CACHE ?
-    if let Some(sender_member) = msg.member(ctx).await {
+    // TODO CACHE ? + Error message
+    if let Ok(sender_member) = msg.member(ctx).await {
         for user in &msg.mentions {
             if let Some(member) = ctx.cache.member(msg.guild_id.unwrap(), user.id).await {
                 debugln!("Kicking {:?}", user);
diff --git a/src/main.rs b/src/main.rs
index bbaaf3e..709a4f3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -44,6 +44,7 @@ pub(crate) static mut INVITE_URL: Option<String> = None;
 
 struct ShardManagerContainer;
 
+// TODO SAVE ON DROP
 impl TypeMapKey for ShardManagerContainer {
     type Value = Arc<Mutex<ShardManager>>;
 }