diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 3e88fe26..f47c51d7 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -1000,6 +1000,12 @@ def main():
     if options.reset_server and not options.server:
         parser.error("option %s: Using --reset-server without --server makes no sense" % "reset-server")
 
+    if options.onserver or not options.server:
+        for d in ['build-tools', 'platform-tools', 'tools']:
+            if not os.path.isdir(os.path.join(config['sdk_path'], d)):
+                raise FDroidException(_("Android SDK '{path}' does not have '{dirname}' installed!")
+                                      .format(path=config['sdk_path'], dirname=d))
+
     log_dir = 'logs'
     if not os.path.isdir(log_dir):
         logging.info("Creating log directory")
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index b4a2382d..e3cd165d 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -437,11 +437,6 @@ def test_sdk_exists(thisconfig):
         logging.critical(_("Android SDK path '{path}' is not a directory!")
                          .format(path=thisconfig['sdk_path']))
         return False
-    for d in ['build-tools', 'platform-tools', 'tools']:
-        if not os.path.isdir(os.path.join(thisconfig['sdk_path'], d)):
-            logging.critical(_("Android SDK '{path}' does not have '{dirname}' installed!")
-                             .format(path=thisconfig['sdk_path'], dirname=d))
-            return False
     return True