diff --git a/bin/v-add-cron-job b/bin/v-add-cron-job
index 3f2c2255d..cd20d26aa 100755
--- a/bin/v-add-cron-job
+++ b/bin/v-add-cron-job
@@ -74,6 +74,9 @@ increase_user_value $user '$U_CRON_JOBS'
 
 # Restart crond
 $BIN/v-restart-cron
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "added cron job $job"
diff --git a/bin/v-add-cron-report b/bin/v-add-cron-report
index f42ade3a5..8a3ded277 100755
--- a/bin/v-add-cron-report
+++ b/bin/v-add-cron-report
@@ -46,6 +46,9 @@ sync_cron_jobs
 
 # Restart crond
 $BIN/v-restart-cron
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "enabled cron reporting"
diff --git a/bin/v-add-dns-domain b/bin/v-add-dns-domain
index 8224543e9..a415959bb 100755
--- a/bin/v-add-dns-domain
+++ b/bin/v-add-dns-domain
@@ -162,6 +162,9 @@ increase_user_value "$user" '$U_DNS_RECORDS' "$records"
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record
index 7562218de..075586f89 100755
--- a/bin/v-add-dns-record
+++ b/bin/v-add-dns-record
@@ -107,6 +107,9 @@ increase_user_value "$user" '$U_DNS_RECORDS'
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-add-sys-ip b/bin/v-add-sys-ip
index 4acd375aa..4ac749e31 100755
--- a/bin/v-add-sys-ip
+++ b/bin/v-add-sys-ip
@@ -152,7 +152,13 @@ fi
 
 # Restart web server
 $BIN/v-restart-web
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 $BIN/v-restart-proxy
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "added system ip address $ip" '' 'admin'
diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain
index 048da8ea8..898d1e15d 100755
--- a/bin/v-add-web-domain
+++ b/bin/v-add-web-domain
@@ -176,6 +176,9 @@ chmod 660 $USER_DATA/web.conf
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-add-web-domain-alias b/bin/v-add-web-domain-alias
index b8000d398..7a27c822a 100755
--- a/bin/v-add-web-domain-alias
+++ b/bin/v-add-web-domain-alias
@@ -103,7 +103,14 @@ increase_user_value "$user" '$U_WEB_ALIASES'
 # Adding task to the vesta pipe
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 log_history "added $dom_alias as alias for $domain"
diff --git a/bin/v-add-web-domain-proxy b/bin/v-add-web-domain-proxy
index cd3d733ba..6a0745b6a 100755
--- a/bin/v-add-web-domain-proxy
+++ b/bin/v-add-web-domain-proxy
@@ -103,6 +103,9 @@ update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions"
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 log_history "enabled proxy support for $domain"
diff --git a/bin/v-add-web-domain-ssl b/bin/v-add-web-domain-ssl
index ca44e1483..af8cb0790 100755
--- a/bin/v-add-web-domain-ssl
+++ b/bin/v-add-web-domain-ssl
@@ -126,6 +126,14 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL' "yes"
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
+    $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-change-cron-job b/bin/v-change-cron-job
index ae90ffc18..faca81446 100755
--- a/bin/v-change-cron-job
+++ b/bin/v-change-cron-job
@@ -65,6 +65,9 @@ sync_cron_jobs
 
 # Restart crond
 $BIN/v-restart-cron
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "changed cron job $job"
diff --git a/bin/v-change-dns-domain-ip b/bin/v-change-dns-domain-ip
index da4aa1fbe..307fd5cbc 100755
--- a/bin/v-change-dns-domain-ip
+++ b/bin/v-change-dns-domain-ip
@@ -70,6 +70,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-change-dns-domain-soa b/bin/v-change-dns-domain-soa
index 48e2851ba..7b1bf9a38 100755
--- a/bin/v-change-dns-domain-soa
+++ b/bin/v-change-dns-domain-soa
@@ -64,6 +64,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-change-dns-domain-tpl b/bin/v-change-dns-domain-tpl
index d245a548b..d708edb97 100755
--- a/bin/v-change-dns-domain-tpl
+++ b/bin/v-change-dns-domain-tpl
@@ -88,6 +88,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-change-dns-domain-ttl b/bin/v-change-dns-domain-ttl
index 690f57ba6..b05836c26 100755
--- a/bin/v-change-dns-domain-ttl
+++ b/bin/v-change-dns-domain-ttl
@@ -63,6 +63,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-change-dns-record b/bin/v-change-dns-record
index 292aae705..22b41d2f3 100755
--- a/bin/v-change-dns-record
+++ b/bin/v-change-dns-record
@@ -98,6 +98,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-change-dns-record-id b/bin/v-change-dns-record-id
index e5cf6aa31..a9474b56c 100755
--- a/bin/v-change-dns-record-id
+++ b/bin/v-change-dns-record-id
@@ -70,6 +70,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-change-sys-ip-nat b/bin/v-change-sys-ip-nat
index b3b4f9268..a60fb9b3d 100755
--- a/bin/v-change-sys-ip-nat
+++ b/bin/v-change-sys-ip-nat
@@ -77,6 +77,9 @@ fi
 # Restart ftp server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-ftp
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-change-web-domain-ip b/bin/v-change-web-domain-ip
index de88ca78b..429784e60 100755
--- a/bin/v-change-web-domain-ip
+++ b/bin/v-change-web-domain-ip
@@ -87,7 +87,14 @@ update_object_value 'web' 'DOMAIN' "$domain" '$IP' "$3"
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-change-web-domain-proxy-tpl b/bin/v-change-web-domain-proxy-tpl
index e276868b1..a92c87bf9 100755
--- a/bin/v-change-web-domain-proxy-tpl
+++ b/bin/v-change-web-domain-proxy-tpl
@@ -94,6 +94,9 @@ update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions"
 # Restart web
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-change-web-domain-sslcert b/bin/v-change-web-domain-sslcert
index 204b2e3d7..42b567931 100755
--- a/bin/v-change-web-domain-sslcert
+++ b/bin/v-change-web-domain-sslcert
@@ -71,7 +71,14 @@ fi
 
 # Restart web server
 $BIN/v-restart-web
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
+
 $BIN/v-restart-proxy
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "changed ssl certificate for $domain"
diff --git a/bin/v-change-web-domain-sslhome b/bin/v-change-web-domain-sslhome
index c2b360f2b..091ad3be1 100755
--- a/bin/v-change-web-domain-sslhome
+++ b/bin/v-change-web-domain-sslhome
@@ -71,7 +71,14 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME' "$SSL_HOME"
 
 # Restart web server
 $BIN/v-restart-web
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
+
 $BIN/v-restart-proxy
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "changed ssl home for $domain to $ssl_home"
diff --git a/bin/v-change-web-domain-tpl b/bin/v-change-web-domain-tpl
index ff7ae8353..66ada8028 100755
--- a/bin/v-change-web-domain-tpl
+++ b/bin/v-change-web-domain-tpl
@@ -96,6 +96,9 @@ update_object_value 'web' 'DOMAIN' "$domain" '$TPL' "$template"
 # Restart web
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-delete-cron-job b/bin/v-delete-cron-job
index 3a62618d5..6e8d8b727 100755
--- a/bin/v-delete-cron-job
+++ b/bin/v-delete-cron-job
@@ -54,6 +54,9 @@ decrease_user_value "$user" '$U_CRON_JOBS'
 
 # Restart crond
 $BIN/v-restart-cron
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "deleted cron job $job"
diff --git a/bin/v-delete-cron-reports b/bin/v-delete-cron-reports
index df70b30a7..6ce3fa382 100755
--- a/bin/v-delete-cron-reports
+++ b/bin/v-delete-cron-reports
@@ -46,6 +46,9 @@ sync_cron_jobs
 
 # Restart crond
 $BIN/v-restart-cron
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "disabled cron reporting"
diff --git a/bin/v-delete-dns-domain b/bin/v-delete-dns-domain
index 774f53819..61907d514 100755
--- a/bin/v-delete-dns-domain
+++ b/bin/v-delete-dns-domain
@@ -75,6 +75,9 @@ decrease_user_value "$user" '$U_DNS_RECORDS' "$records"
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns $restart
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-delete-dns-domains b/bin/v-delete-dns-domains
index 7e94eae96..dfb361531 100755
--- a/bin/v-delete-dns-domains
+++ b/bin/v-delete-dns-domains
@@ -43,6 +43,9 @@ done
 
 # Restart named
 $BIN/v-restart-dns
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_event "$OK" "$EVENT"
diff --git a/bin/v-delete-dns-domains-src b/bin/v-delete-dns-domains-src
index 8c9f4de4e..69f86614b 100755
--- a/bin/v-delete-dns-domains-src
+++ b/bin/v-delete-dns-domains-src
@@ -46,6 +46,9 @@ done
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-delete-dns-record b/bin/v-delete-dns-record
index e3de75fa8..2e02dc5e6 100755
--- a/bin/v-delete-dns-record
+++ b/bin/v-delete-dns-record
@@ -69,6 +69,9 @@ decrease_user_value "$user" '$U_DNS_RECORDS'
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-delete-domain b/bin/v-delete-domain
index be7d487f6..a9c966be8 100755
--- a/bin/v-delete-domain
+++ b/bin/v-delete-domain
@@ -39,7 +39,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
     if [  ! -z "$check_web" ]; then
         $BIN/v-delete-web-domain $user $domain
         if [ $? -ne 0 ]; then
-            exit $?
+            exit E_RESTART
         fi
     fi
 fi
@@ -50,7 +50,7 @@ if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
     if [  ! -z "$check_dns" ]; then
         $BIN/v-delete-dns-domain $user $domain
         if [ $? -ne 0 ]; then
-            exit $?
+            exit E_RESTART
         fi
     fi
 fi
@@ -61,7 +61,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
     if [  ! -z "$check_mail" ]; then
         $BIN/v-delete-mail-domain $user $domain
         if [ $? -ne 0 ]; then
-            exit $?
+            exit E_RESTART
         fi
     fi
 fi
diff --git a/bin/v-delete-sys-ip b/bin/v-delete-sys-ip
index 54601bc11..0a1c9aac8 100755
--- a/bin/v-delete-sys-ip
+++ b/bin/v-delete-sys-ip
@@ -121,7 +121,14 @@ fi
 
 # Adding task to the vesta pipe
 $BIN/v-restart-web
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
+
 $BIN/v-restart-proxy
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "deleted system ip address $ip"
diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain
index edba9747e..532ce00ff 100755
--- a/bin/v-delete-web-domain
+++ b/bin/v-delete-web-domain
@@ -154,7 +154,14 @@ fi
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-delete-web-domain-alias b/bin/v-delete-web-domain-alias
index c7b66a474..d6862a5f6 100755
--- a/bin/v-delete-web-domain-alias
+++ b/bin/v-delete-web-domain-alias
@@ -101,7 +101,14 @@ decrease_user_value "$user" '$U_WEB_ALIASES'
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-delete-web-domain-proxy b/bin/v-delete-web-domain-proxy
index 20c4ff4a0..25e6b9d9e 100755
--- a/bin/v-delete-web-domain-proxy
+++ b/bin/v-delete-web-domain-proxy
@@ -80,6 +80,9 @@ fi
 # Restart proxy server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-delete-web-domain-ssl b/bin/v-delete-web-domain-ssl
index 61d0072d3..d09dc9ad4 100755
--- a/bin/v-delete-web-domain-ssl
+++ b/bin/v-delete-web-domain-ssl
@@ -92,7 +92,14 @@ decrease_user_value "$user" '$U_WEB_SSL'
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-delete-web-domains b/bin/v-delete-web-domains
index ff7052c8a..aff5436d5 100755
--- a/bin/v-delete-web-domains
+++ b/bin/v-delete-web-domains
@@ -45,7 +45,14 @@ done
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-insert-dns-domain b/bin/v-insert-dns-domain
index cdd98de66..949cdfde5 100755
--- a/bin/v-insert-dns-domain
+++ b/bin/v-insert-dns-domain
@@ -72,6 +72,9 @@ chmod 660 $USER_DATA/dns.conf
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns $restart
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-insert-dns-record b/bin/v-insert-dns-record
index cd888471b..29bb3b2cd 100755
--- a/bin/v-insert-dns-record
+++ b/bin/v-insert-dns-record
@@ -47,6 +47,9 @@ echo "$data" >> $USER_DATA/dns/$domain.conf
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns $restart
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-insert-dns-records b/bin/v-insert-dns-records
index 302951e70..5b5b230f0 100755
--- a/bin/v-insert-dns-records
+++ b/bin/v-insert-dns-records
@@ -50,6 +50,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-rebuild-cron-jobs b/bin/v-rebuild-cron-jobs
index 0edc1909b..1f229b94b 100755
--- a/bin/v-rebuild-cron-jobs
+++ b/bin/v-rebuild-cron-jobs
@@ -43,6 +43,9 @@ sync_cron_jobs
 # Restart crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-rebuild-dns-domain b/bin/v-rebuild-dns-domain
index 564b2aaaa..31be08d13 100755
--- a/bin/v-rebuild-dns-domain
+++ b/bin/v-rebuild-dns-domain
@@ -78,6 +78,9 @@ update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns"
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns "$restart"
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-rebuild-dns-domains b/bin/v-rebuild-dns-domains
index 2fd2aeee2..e34e38120 100755
--- a/bin/v-rebuild-dns-domains
+++ b/bin/v-rebuild-dns-domains
@@ -78,6 +78,9 @@ update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns"
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains
index 90294eb98..663dee410 100755
--- a/bin/v-rebuild-web-domains
+++ b/bin/v-rebuild-web-domains
@@ -148,7 +148,14 @@ update_user_value "$user" '$U_WEB_ALIASES' "$user_aliases"
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-restart-dns b/bin/v-restart-dns
index 67025040a..9b3dbae2f 100755
--- a/bin/v-restart-dns
+++ b/bin/v-restart-dns
@@ -56,6 +56,7 @@ if [ $? -ne 0 ]; then
     /etc/init.d/$DNS_SYSTEM restart >/dev/null 2>&1
     if [ $? -ne 0 ]; then
         send_email_report
+        echo "Error: $DNS_SYSTEM restart failed"
         exit $E_RESTART
     fi
 fi
diff --git a/bin/v-restart-ftp b/bin/v-restart-ftp
index 7d02b0623..c002fc07b 100755
--- a/bin/v-restart-ftp
+++ b/bin/v-restart-ftp
@@ -48,6 +48,7 @@ fi
 /etc/init.d/$FTP_SYSTEM restart >/dev/null 2>&1
 if [ $? -ne 0 ]; then
     send_email_report
+    echo "Error: $FTP_SYSTEM restart failed"
     exit $E_RESTART
 fi
 
diff --git a/bin/v-restart-mail b/bin/v-restart-mail
index 2247e1200..c1ae4a347 100755
--- a/bin/v-restart-mail
+++ b/bin/v-restart-mail
@@ -49,6 +49,7 @@ fi
 /etc/init.d/$MAIL_SYSTEM restart >/dev/null 2>&1
 if [ $? -ne 0 ]; then
     send_email_report
+    echo "Error: $MAIL_SYSTEM restart failed"
     exit $E_RESTART
 fi
 
diff --git a/bin/v-restart-proxy b/bin/v-restart-proxy
index c13072a28..89c68437e 100755
--- a/bin/v-restart-proxy
+++ b/bin/v-restart-proxy
@@ -45,13 +45,11 @@ if [ -z "$PROXY_SYSTEM" ]; then
 fi
 
 # Restart system
-/etc/init.d/$PROXY_SYSTEM reload >/dev/null 2>&1
+/etc/init.d/$PROXY_SYSTEM restart >/dev/null 2>&1
 if [ $? -ne 0 ]; then
-    /etc/init.d/$PROXY_SYSTEM restart >/dev/null 2>&1
-    if [ $? -ne 0 ]; then
-        send_email_report
-        exit $E_RESTART
-    fi
+    send_email_report
+    echo "Error: $PROXY_SYSTEM restart failed"
+    exit $E_RESTART
 fi
 
 # Update restart queue
diff --git a/bin/v-restart-web b/bin/v-restart-web
index 568db9fbb..9c321cb60 100755
--- a/bin/v-restart-web
+++ b/bin/v-restart-web
@@ -53,6 +53,7 @@ if [ "$WEB_SYSTEM" == 'apache2' ]; then
         /etc/init.d/$WEB_SYSTEM restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
             send_email_report
+            echo "Error: $WEB_SYSTEM restart failed"
             exit $E_RESTART
         fi
     fi
@@ -62,6 +63,7 @@ else
         /etc/init.d/$WEB_SYSTEM restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
             send_email_report
+            echo "Error: $WEB_SYSTEM restart failed"
             exit $E_RESTART
         fi
     fi
diff --git a/bin/v-restore-user b/bin/v-restore-user
index a7a6f74c4..fe48dba70 100755
--- a/bin/v-restore-user
+++ b/bin/v-restore-user
@@ -372,7 +372,15 @@ if [ "$web" != 'no' ]; then
 
     # Restart WEB
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     echo
     msg="$msg\n"
 fi
@@ -482,6 +490,10 @@ if [ "$dns" != 'no' ]; then
 
     # Restart DNS
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     echo
     msg="$msg\n"
 fi
@@ -695,6 +707,10 @@ if [ "$cron" != 'no' ]; then
 
     # Restart cron
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     echo
     msg="$msg\n"
 fi
diff --git a/bin/v-suspend-cron-job b/bin/v-suspend-cron-job
index 393ddda93..a26eae21b 100755
--- a/bin/v-suspend-cron-job
+++ b/bin/v-suspend-cron-job
@@ -49,6 +49,9 @@ sync_cron_jobs
 # Restart crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-suspend-cron-jobs b/bin/v-suspend-cron-jobs
index cd6b30771..577860c48 100755
--- a/bin/v-suspend-cron-jobs
+++ b/bin/v-suspend-cron-jobs
@@ -44,6 +44,9 @@ done
 # Restart crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-suspend-dns-domain b/bin/v-suspend-dns-domain
index 25b430342..3972fc39f 100755
--- a/bin/v-suspend-dns-domain
+++ b/bin/v-suspend-dns-domain
@@ -49,6 +49,9 @@ increase_user_value "$user" '$SUSPENDED_DNS'
 # Restart named
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging
diff --git a/bin/v-suspend-dns-domains b/bin/v-suspend-dns-domains
index e6083e5dc..0b2a5e895 100755
--- a/bin/v-suspend-dns-domains
+++ b/bin/v-suspend-dns-domains
@@ -45,6 +45,9 @@ done
 # Restart dns server
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging
diff --git a/bin/v-suspend-dns-record b/bin/v-suspend-dns-record
index 417c3add2..30da60def 100755
--- a/bin/v-suspend-dns-record
+++ b/bin/v-suspend-dns-record
@@ -63,6 +63,9 @@ update_domain_zone
 # Restart named
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging
diff --git a/bin/v-suspend-user b/bin/v-suspend-user
index 5a754d05d..d812d23f4 100755
--- a/bin/v-suspend-user
+++ b/bin/v-suspend-user
@@ -71,8 +71,19 @@ fi
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Changing suspend value
diff --git a/bin/v-suspend-web-domain b/bin/v-suspend-web-domain
index 005b81527..963929953 100755
--- a/bin/v-suspend-web-domain
+++ b/bin/v-suspend-web-domain
@@ -91,7 +91,14 @@ increase_user_value "$user" '$SUSPENDED_WEB'
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-suspend-web-domains b/bin/v-suspend-web-domains
index 29e07c6a6..eda982c62 100755
--- a/bin/v-suspend-web-domains
+++ b/bin/v-suspend-web-domains
@@ -45,6 +45,14 @@ done
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
+    $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-unsuspend-cron-job b/bin/v-unsuspend-cron-job
index 8a184691b..685bcf177 100755
--- a/bin/v-unsuspend-cron-job
+++ b/bin/v-unsuspend-cron-job
@@ -49,6 +49,9 @@ sync_cron_jobs
 # Restart crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-unsuspend-cron-jobs b/bin/v-unsuspend-cron-jobs
index 0f3994fa6..ad0f07e99 100755
--- a/bin/v-unsuspend-cron-jobs
+++ b/bin/v-unsuspend-cron-jobs
@@ -44,6 +44,9 @@ done
 # Restart crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-unsuspend-dns-domain b/bin/v-unsuspend-dns-domain
index 4e91f514d..9be0b4c8e 100755
--- a/bin/v-unsuspend-dns-domain
+++ b/bin/v-unsuspend-dns-domain
@@ -51,6 +51,9 @@ sed -i "s/SUSPENDED='yes'/SUSPENDED='no'/g" $USER_DATA/dns/$domain.conf
 # Restart named
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging
diff --git a/bin/v-unsuspend-dns-domains b/bin/v-unsuspend-dns-domains
index 0807912af..f06c22185 100755
--- a/bin/v-unsuspend-dns-domains
+++ b/bin/v-unsuspend-dns-domains
@@ -45,6 +45,9 @@ done
 # Restart dns server
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging
diff --git a/bin/v-unsuspend-dns-record b/bin/v-unsuspend-dns-record
index 3d9d048fd..3d4a53ce7 100755
--- a/bin/v-unsuspend-dns-record
+++ b/bin/v-unsuspend-dns-record
@@ -62,6 +62,9 @@ update_domain_zone
 # Restart named
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging
diff --git a/bin/v-unsuspend-user b/bin/v-unsuspend-user
index 47618a4e1..00a21b6f0 100755
--- a/bin/v-unsuspend-user
+++ b/bin/v-unsuspend-user
@@ -73,8 +73,19 @@ decrease_user_value 'admin' '$SUSPENDED_USERS'
 
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-unsuspend-web-domain b/bin/v-unsuspend-web-domain
index eaae49e56..74e4e5f8b 100755
--- a/bin/v-unsuspend-web-domain
+++ b/bin/v-unsuspend-web-domain
@@ -88,7 +88,14 @@ decrease_user_value "$user" '$SUSPENDED_WEB'
 # Restart web erver
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-unsuspend-web-domains b/bin/v-unsuspend-web-domains
index d60d07274..a9f713f54 100755
--- a/bin/v-unsuspend-web-domains
+++ b/bin/v-unsuspend-web-domains
@@ -46,6 +46,14 @@ done
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
+    $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging
diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip
index bde0b008d..b0309b182 100755
--- a/bin/v-update-sys-ip
+++ b/bin/v-update-sys-ip
@@ -53,6 +53,9 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then
                 /etc/$PROXY_SYSTEM/conf.d/$new.conf
             sed -i "s/$old/$new/g" /etc/$PROXY_SYSTEM/conf.d/$new.conf
             $BIN/v-restart-proxy
+            if [ $? -ne 0 ]; then
+                exit E_RESTART
+            fi
         fi
         if [ ! -z "$WEB_SYSTEM" ]; then
             mv /etc/$WEB_SYSTEM/conf.d/$old.conf \
@@ -65,6 +68,9 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then
                 $BIN/v-rebuild-web-domains $user no
             done
             $BIN/v-restart-web
+            if [ $? -ne 0 ]; then
+                exit E_RESTART
+            fi
         fi
 
         if [ ! -z "$DNS_SYSTEM" ]; then
@@ -75,6 +81,9 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then
                 $BIN/v-rebuild-dns-domains $user no
             done
             $BIN/v-restart-dns
+            if [ $? -ne 0 ]; then
+                exit E_RESTART
+            fi
         fi
 
         # No further comparation is needed
diff --git a/bin/v-update-web-templates b/bin/v-update-web-templates
index 8d426240b..5f0778409 100755
--- a/bin/v-update-web-templates
+++ b/bin/v-update-web-templates
@@ -64,7 +64,14 @@ done
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Delete tmpdir