diff --git a/commands/utils/avatar.js b/commands/utils/avatar.js
index 8a669c5..e150a4f 100644
--- a/commands/utils/avatar.js
+++ b/commands/utils/avatar.js
@@ -3,17 +3,25 @@ module.exports = {
   name: 'avatar',
   description: 'Affiche l\'avatar d\'un utilisateur',
   async execute(message, args, client) {
-        let user;
-    if (args.length > 0) {
+    let user;
+    if (message.mentions.users.size > 0) {
+      user = message.mentions.users.first();
+    } else if (args.length > 0) {
       const userId = args[0];
       user = message.guild.members.cache.get(userId)?.user;
     } else {
-      user = message.mentions.users.first() || message.author;
+      user = message.author;
     }
     if (!user) {
       return message.reply('Utilisateur introuvable.');
     }
 
+    let avatar = user.avatarURL({dynamic : true, size : 1024});
+    console.log(avatar);
+    if (user.avatarURL({dynamic : true, size : 1024}) === null) {
+      return message.reply('L\'utilisateur n\'a pas d\'avatar.');
+    }
+
     const button = new ButtonBuilder()
       .setLabel('Avatar url')
       .setURL(user.avatarURL({dynamic : true, size : 1024}))
@@ -21,10 +29,10 @@ module.exports = {
       
     const row = new ActionRowBuilder()
       .addComponents(button);
-
+    
     const embed = new EmbedBuilder()
     .setTitle(`Avatar de ${user.tag}`)
-    .setImage(user.avatarURL({dynamic : true, size : 1024}))
+    .setImage(avatar)
     message.reply({ 
       embeds: [embed], 
       components: [row]