diff --git a/lib/aaa_errors.sh b/lib/aaa_errors.sh
index 645e12c..07a78b4 100644
--- a/lib/aaa_errors.sh
+++ b/lib/aaa_errors.sh
@@ -82,16 +82,19 @@ function backtrace
 
 
 # ------------------------------------------------------------------------------
-# Execute command outside of error control
+# Execute command outside of error control, echoes ouput error code
 noerror()
 {
     set +o errexit
     trap - ERR
 
     $@
+    local code=$?
 
     trap "error ${LINENO}" ERR
     set -o errexit
+    
+    echo $code
 }
 
 
diff --git a/modules/conf_mail.sh b/modules/conf_mail.sh
index c991fa5..cfe49de 100644
--- a/modules/conf_mail.sh
+++ b/modules/conf_mail.sh
@@ -29,7 +29,7 @@ conf_mail()
 
 precheck_conf_mail()
 {
-    if [[ -n $MAINDOM ]]; then
+    if [[ -z $MAINDOM ]]; then
         prnt E "Aucun domaine principal renseigné."
         die 158
     fi
diff --git a/modules/upgrade_dist.sh b/modules/upgrade_dist.sh
index 9e49a45..e3d9a25 100644
--- a/modules/upgrade_dist.sh
+++ b/modules/upgrade_dist.sh
@@ -21,8 +21,8 @@ upgrade_dist()
     
     prnt I "Configuration du proxy pour APT..."
     if [[ $PROXYAPT ]]; then
-        if [[ ! -d $(basedir $proxyfile) ]]; then
-            mkdir -pv $(basedir $proxyfile) || (
+        if [[ ! -d $(dirname $proxyfile) ]]; then
+            mkdir -pv $(dirname $proxyfile) || (
                 prnt E "Impossiblle de créer le répertoire d'accueil pour la configuration d'APT."
                 die 60
             )
@@ -47,8 +47,8 @@ upgrade_dist()
 precheck_upgrade_dist()
 {
     prnt I "Vérification du réseau..."
-    noerror wget -q --tries=10 --timeout=20 --spider http://www.cnrs.fr
-    if [[ ! $? -eq 0 ]]; then
+    
+    if [[ $(noerror wget -q --tries=10 --timeout=20 --spider http://www.cnrs.fr) != 0 ]]; then
         prnt E "Réseau non fonctionnel ! Abandon."
         die 160
     fi