diff --git a/src/main/java/net/Broken/BotListener.java b/src/main/java/net/Broken/BotListener.java
index 23c3ae1..89cd598 100644
--- a/src/main/java/net/Broken/BotListener.java
+++ b/src/main/java/net/Broken/BotListener.java
@@ -42,8 +42,9 @@ public class BotListener extends ListenerAdapter {
     @Override
     public void onGuildMemberJoin(GuildMemberJoinEvent event) {
         logger.info(event.getUser().getName()+ "join the guild, move it!");
-        new Move().exc(event.getMember(),event.getJDA().getRolesByName("Newbies",true),false,event.getJDA().getGuilds().get(0),event.getJDA().getGuilds().get(0).getManager());
+        new Move().exc(event.getMember(),event.getJDA().getRolesByName("Newbies",true),false,event.getGuild(),event.getGuild().getManager());
         TextChannel chanel = event.getGuild().getTextChannelsByName("accueil", true).get(0);
+        if(chanel != null)
         chanel.sendMessage("Salut "+event.getUser().getAsMention()+"! Ecris ton nom, prénom, ta promotion et ton groupe ici! Un admin te donnera accées a ton groupe!").complete();
         MainBot.roleFlag = false;
     }
@@ -55,7 +56,7 @@ public class BotListener extends ListenerAdapter {
 
             if(event.getMember().getRoles().size() == 0){
                 logger.info(event.getUser().getName()+ "have no roles, move it!");
-                new Move().exc(event.getMember(),event.getJDA().getRolesByName("Populace",true),false,event.getJDA().getGuilds().get(0),event.getJDA().getGuilds().get(0).getManager());
+                new Move().exc(event.getMember(),event.getGuild().getRolesByName("Populace",true),false,event.getGuild(),event.getGuild().getManager());
                 MainBot.roleFlag = false;
             }
         }
diff --git a/src/main/java/net/Broken/Commands/Help.java b/src/main/java/net/Broken/Commands/Help.java
index fe93065..8f5b2cb 100644
--- a/src/main/java/net/Broken/Commands/Help.java
+++ b/src/main/java/net/Broken/Commands/Help.java
@@ -120,7 +120,7 @@ public class Help implements Commande {
 
             boolean isAdmin;
             if(event.isFromType(ChannelType.PRIVATE))
-                isAdmin = event.getJDA().getGuilds().get(0).getMember(event.getAuthor()).hasPermission(Permission.ADMINISTRATOR);
+                isAdmin = event.getGuild().getMember(event.getAuthor()).hasPermission(Permission.ADMINISTRATOR);
             else
                 isAdmin = event.getMember().hasPermission(Permission.ADMINISTRATOR);
 
diff --git a/src/main/java/net/Broken/MainBot.java b/src/main/java/net/Broken/MainBot.java
index 1f096bf..181582e 100644
--- a/src/main/java/net/Broken/MainBot.java
+++ b/src/main/java/net/Broken/MainBot.java
@@ -111,7 +111,7 @@ public class MainBot {
             Commande cmdObj = commandes.get(cmd.commande);
             boolean isAdmin;
             if(cmd.event.isFromType(ChannelType.PRIVATE)){
-                isAdmin = jda.getGuilds().get(0).getMember(cmd.event.getAuthor()).hasPermission(Permission.ADMINISTRATOR);
+                isAdmin = cmd.event.getGuild().getMember(cmd.event.getAuthor()).hasPermission(Permission.ADMINISTRATOR);
             }
             else
                 isAdmin = cmd.event.getMember().hasPermission(Permission.ADMINISTRATOR);