diff --git a/moveyourPOP.au3 b/moveyourPOP.au3
index cb50205..2f27b28 100644
--- a/moveyourPOP.au3
+++ b/moveyourPOP.au3
@@ -241,7 +241,12 @@ While 1
 						DirCreate($localFolderDirectory&"\_Archives de "&$accountName&".sbd")
 						$dst = $localFolderDirectory&"\_Archives de "&$accountName&".sbd"
 						FileWrite($localFolderDirectory&"\_Archives de "&$accountName, "")
-						RunWait(@ComSpec & ' /c powershell.exe -Command "Move-Item -Path ''' & $directory & '\*'' -Destination ''' & $dst & '''"', "")
+						$cmdMove = RunWait(@ComSpec & ' /c powershell.exe -Command "Move-Item -Path ''' & $directory & '\*'' -Destination ''' & $dst & '''"', "")
+						If $cmdMove <> 0 Then
+							MsgBox(16, "MoveYourPOP", "Erreur lors du déplacement des mails de "&$accountName&" vers "&$dst&@CRLF&@CRLF&"le programme va s'arrêter."&@CRLF&"Aucun changement n'a été effectué.")
+							FileDelete($profileDirectory&"\user.js")
+							Exit
+						EndIf
 					Next
 				EndIf
 				
@@ -376,7 +381,10 @@ Func _backup($source, $destination)
 	$dateHeure = StringFormat("%02d_%02d_%04d_%02dh%02dm%02ds", @MDAY, @MON, @YEAR, @HOUR, @MIN, @SEC)
 	$name = StringSplit($source, "\")
 	$name = $name[$name[0]]&"_backup_"&$dateHeure
-	RunWait('robocopy.exe "' & $source & '" "' & $destination & '\' & $name & '" /E /COPY:DAT /MT:16 /R:3 /W:5')
+	$cmdSave = RunWait('robocopy.exe "' & $source & '" "' & $destination & '\' & $name & '" /E /COPY:DAT /MT:16 /R:3 /W:5')
+	if $cmdSave >= 8 Then
+		MsgBox(16, "MoveYourPOP", "Il y a eu des erreurs lors de la sauvegarde")
+	EndIf
 	Return $name
 EndFunc