diff --git a/server/activator.py b/server/activator.py
index 834d5ca95..8fae22771 100644
--- a/server/activator.py
+++ b/server/activator.py
@@ -118,12 +118,12 @@ if not entropyTools.is_root():
     raise SystemExit(2)
 elif (options[0] == "sync"):
     import server_activator
-    server_activator.sync(options[1:])
-    raise SystemExit(0)
+    rc = server_activator.sync(options[1:])
+    raise SystemExit(rc)
 elif (options[0] == "tidy"):
     import server_activator
-    server_activator.sync(options[1:], justTidy = True)
-    raise SystemExit(0)
+    rc = server_activator.sync(options[1:], justTidy = True)
+    raise SystemExit(rc)
 elif (options[0] == "database"):
     import server_activator
     server_activator.database(options[1:])
diff --git a/server/server_activator.py b/server/server_activator.py
index 7b768e7c7..0b6f69e62 100644
--- a/server/server_activator.py
+++ b/server/server_activator.py
@@ -39,7 +39,7 @@ def sync(options, justTidy = False):
             sync_all = True
         elif opt.startswith("--"):
             print_error(red(" %s." % (_("Wrong parameters"),) ))
-            return
+            return 1
         else:
             myopts.append(opt)
     options = myopts
@@ -89,6 +89,8 @@ def sync(options, justTidy = False):
     if old_default != Entropy.default_repository:
         Entropy.switch_default_repository(old_default)
 
+    return 0
+
 
 def packages(options):