diff --git a/asmodee.py b/asmodee.py
index 6fc6736..ac11a53 100755
--- a/asmodee.py
+++ b/asmodee.py
@@ -301,14 +301,16 @@ def msg(room,msg,sender,content=False):
 			if (sender not in admins and sender not in lmod):
 				msg = msg.replace('@room', 'tout le monde')
 		except:
-			msg = msg.replace('@room', 'tout le monde')
+			try:
+				msg = msg.replace('@room', 'tout le monde')
+			except
+				print(msg)
 		if content:
 			bot.client.api.send_message_event(room.room_id, 'm.room.message', msg, None, None)
 		else:
 			room.send_text(msg)
 	except:
 		room.send_text("Impossible d'envoyer le message")
-		print(msg)
 
 def verifPMRoom(room, event): # Pour obtenir ou créer un salon pour les messages privés avec l'utilisateur
 	global bot
@@ -1864,7 +1866,10 @@ def envoi_mail(room,event): # envoi des messages aux abonnés par mail
 		except:
 			lmails = []
 		sender = event['sender']
-		body = event['content']['body']
+		try:
+			body = event['content']['body']
+		except:
+			body = ""
 		for mail in lmails:
 			if (malt == "1"):
 				os.system('echo ' + body + ' | mailx -s ' + sender + ' -r ' + msender + ' ' + mail)