diff --git a/src/org/dclermonte/siba/Siba.java b/src/org/dclermonte/siba/Siba.java
index 7d2ffa4..fea1f9f 100644
--- a/src/org/dclermonte/siba/Siba.java
+++ b/src/org/dclermonte/siba/Siba.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
  */
 public class Siba
 {
-	private static final Logger logger = LoggerFactory.getLogger(Siba.class);
+	private static Logger logger = LoggerFactory.getLogger(Siba.class);
 
 	public static void main(final String[] args)
 	{
diff --git a/src/org/dclermonte/siba/cli/SibaCLI.java b/src/org/dclermonte/siba/cli/SibaCLI.java
index 91f9efb..9045815 100644
--- a/src/org/dclermonte/siba/cli/SibaCLI.java
+++ b/src/org/dclermonte/siba/cli/SibaCLI.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
  */
 public class SibaCLI
 {
-	private static final Logger logger = LoggerFactory.getLogger(SibaCLI.class);
+	private static Logger logger = LoggerFactory.getLogger(SibaCLI.class);
 	private static final ResourceBundle BUNDLE = ResourceBundle.getBundle("org.dclermonte.siba.cli.messages"); //$NON-NLS-1$
 
 	public static void backup(final File directoryToSave) throws SibaException
@@ -97,6 +97,34 @@ public class SibaCLI
 		System.out.println("siba check [filename | filename.tgz | filename.tgz.md5]");
 	}
 
+	/**
+	 *
+	 */
+	public static void manageSibaCLIException()
+	{
+		// Set default CLI catch.
+		Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler()
+		{
+			@Override
+			public void uncaughtException(final Thread thread, final Throwable exception)
+			{
+				String message;
+				if (exception instanceof OutOfMemoryError)
+				{
+					message = "Java ran out of memory!\n\n";
+				}
+				else
+				{
+					message = "An error occured: " + exception.getClass() + "(" + exception.getMessage() + ")";
+				}
+
+				logger.error("uncaughtException ", exception);
+				logger.error(message);
+				logger.info(BUNDLE.getString("UnexpectedError.text"));
+			}
+		});
+	}
+
 	/**
 	 *
 	 * This method launch CLI.
@@ -105,9 +133,9 @@ public class SibaCLI
 	 */
 	public static void run(final String[] args)
 	{
-		sibaCLIException();
 		try
 		{
+			manageSibaCLIException();
 			// This part implements an automate.
 			int parameterCount = args.length;
 			if (parameterCount == 0)
@@ -181,31 +209,4 @@ public class SibaCLI
 			help();
 		}
 	}
-
-	/**
-	 * 
-	 */
-	public static void sibaCLIException()
-	{
-		// Set default CLI catch.
-		Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler()
-		{
-			@Override
-			public void uncaughtException(final Thread thread, final Throwable exception)
-			{
-				String message;
-				if (exception instanceof OutOfMemoryError)
-				{
-					message = "Java ran out of memory!\n\n";
-				}
-				else
-				{
-					message = "An error occured: " + exception.getClass() + "(" + exception.getMessage() + ")";
-				}
-
-				logger.error("uncaughtException ", exception);
-				logger.error(message);
-			}
-		});
-	}
 }
diff --git a/src/org/dclermonte/siba/cli/messages.properties b/src/org/dclermonte/siba/cli/messages.properties
index 1f2cf73..8515bdd 100644
--- a/src/org/dclermonte/siba/cli/messages.properties
+++ b/src/org/dclermonte/siba/cli/messages.properties
@@ -9,4 +9,5 @@ missingFileToCheck.text = Missing the file to check
 missingTargetFile.text=missing target file
 NotDirectorySource.text=Source is not a directory
 SibaManageralgorithm.text=Algorithm error in sibaManagerexception
-ToManyParameter.text= Bad number of parameters
\ No newline at end of file
+ToManyParameter.text= Bad number of parameters
+UnexpectedError.text = An error occur, contact your administrator
\ No newline at end of file
diff --git a/src/org/dclermonte/siba/cli/messages_fr_FR.properties b/src/org/dclermonte/siba/cli/messages_fr_FR.properties
index 25ba9eb..efdda5c 100644
--- a/src/org/dclermonte/siba/cli/messages_fr_FR.properties
+++ b/src/org/dclermonte/siba/cli/messages_fr_FR.properties
@@ -9,4 +9,5 @@ missingFileToCheck.text = Il manque le fichier 
 missingTargetFile.text=Le répertoire destination n'existe pas
 NotDirectorySource.text=La source n'est pas un répertoire
 SibaManageralgorithm.text=Erreur d'algorithme dans sibaManager
-ToManyParameter.text= Trop de paramètres
\ No newline at end of file
+ToManyParameter.text= Trop de paramètres
+UnexpectedError.text= Une erreur s'est produite, contactez votre administrateur
\ No newline at end of file
diff --git a/src/org/dclermonte/siba/gui/CheckDirectorySelector.java b/src/org/dclermonte/siba/gui/CheckDirectorySelector.java
index 2fda768..581ea1e 100644
--- a/src/org/dclermonte/siba/gui/CheckDirectorySelector.java
+++ b/src/org/dclermonte/siba/gui/CheckDirectorySelector.java
@@ -21,7 +21,7 @@ public class CheckDirectorySelector extends JFileChooser
 {
 	private static final long serialVersionUID = 3782597353602048214L;
 	private static final ResourceBundle BUNDLE = ResourceBundle.getBundle("org.dclermonte.siba.gui.messages"); //$NON-NLS-1$
-	private static final Logger logger = LoggerFactory.getLogger(CheckDirectorySelector.class);
+	private static Logger logger = LoggerFactory.getLogger(CheckDirectorySelector.class);
 
 	/**
 	 *
diff --git a/src/org/dclermonte/siba/gui/CheckPanel.java b/src/org/dclermonte/siba/gui/CheckPanel.java
index d190cb4..b513981 100644
--- a/src/org/dclermonte/siba/gui/CheckPanel.java
+++ b/src/org/dclermonte/siba/gui/CheckPanel.java
@@ -57,7 +57,7 @@ public class CheckPanel extends JPanel
 {
 	private static final long serialVersionUID = 4495957907349664847L;
 	private static final ResourceBundle BUNDLE = ResourceBundle.getBundle("org.dclermonte.siba.gui.messages"); //$NON-NLS-1$
-	public static final Logger logger = LoggerFactory.getLogger(CheckPanel.class);
+	public static Logger logger = LoggerFactory.getLogger(CheckPanel.class);
 	private JTextField fileToCheckField;
 
 	/**
diff --git a/src/org/dclermonte/siba/gui/SibaGUI.java b/src/org/dclermonte/siba/gui/SibaGUI.java
index 7f73296..b965267 100644
--- a/src/org/dclermonte/siba/gui/SibaGUI.java
+++ b/src/org/dclermonte/siba/gui/SibaGUI.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
 public class SibaGUI
 {
 	private static final ResourceBundle BUNDLE = ResourceBundle.getBundle("org.dclermonte.siba.gui.messages"); //$NON-NLS-1$
-	public static final Logger logger = LoggerFactory.getLogger(SibaGUI.class);
+	public static Logger logger = LoggerFactory.getLogger(SibaGUI.class);
 	private JFrame frmSimpleBackup;
 
 	/**
diff --git a/src/org/dclermonte/siba/gui/SourceDirectorySelector.java b/src/org/dclermonte/siba/gui/SourceDirectorySelector.java
index fa2ab8c..728830a 100644
--- a/src/org/dclermonte/siba/gui/SourceDirectorySelector.java
+++ b/src/org/dclermonte/siba/gui/SourceDirectorySelector.java
@@ -19,7 +19,7 @@ public class SourceDirectorySelector extends JFileChooser
 {
 	private static final long serialVersionUID = 3782597353602048214L;
 	private static final ResourceBundle BUNDLE = ResourceBundle.getBundle("org.dclermonte.siba.gui.messages"); //$NON-NLS-1$
-	public static final Logger logger = LoggerFactory.getLogger(SourceDirectorySelector.class);
+	public static Logger logger = LoggerFactory.getLogger(SourceDirectorySelector.class);
 
 	/**
 	 *
diff --git a/src/org/dclermonte/siba/gui/TargetDirectorySelector.java b/src/org/dclermonte/siba/gui/TargetDirectorySelector.java
index 7961441..1a5fde0 100644
--- a/src/org/dclermonte/siba/gui/TargetDirectorySelector.java
+++ b/src/org/dclermonte/siba/gui/TargetDirectorySelector.java
@@ -19,7 +19,7 @@ public class TargetDirectorySelector extends JFileChooser
 {
 	private static final long serialVersionUID = 3782597353602048214L;
 	private static final ResourceBundle BUNDLE = ResourceBundle.getBundle("org.dclermonte.siba.gui.messages"); //$NON-NLS-1$
-	public static final Logger logger = LoggerFactory.getLogger(TargetDirectorySelector.class);
+	public static Logger logger = LoggerFactory.getLogger(TargetDirectorySelector.class);
 
 	/**
 	 *