diff --git a/src/yunohost/tools.py b/src/yunohost/tools.py
index 8b6e5cc44..c209254b8 100644
--- a/src/yunohost/tools.py
+++ b/src/yunohost/tools.py
@@ -593,7 +593,12 @@ def tools_diagnosis(auth, private=False):
         }
 
     # nginx -t
-    diagnosis['nginx'] = check_output("nginx -t").strip().split("\n")
+    try:
+        diagnosis['nginx'] = check_output("nginx -t").strip().split("\n")
+    except Exception as e:
+        import traceback
+        traceback.print_exc()
+        logger.warning("Unable to check 'nginx -t', exception: %s" % e)
 
     # Services status
     services = service_status()