diff --git a/data/hooks/diagnosis/14-ports.py b/data/hooks/diagnosis/14-ports.py
index f9694a9de..aaf31d561 100644
--- a/data/hooks/diagnosis/14-ports.py
+++ b/data/hooks/diagnosis/14-ports.py
@@ -26,16 +26,20 @@ class PortsDiagnoser(Diagnoser):
                 ports[port] = service
 
         try:
-            r = requests.post('https://diagnosis.yunohost.org/check-ports', json={'ports': ports.keys()}, timeout=30).json()
-            if "status" not in r.keys():
-                raise Exception("Bad syntax for response ? Raw json: %s" % str(r))
-            elif r["status"] == "error":
-                if "content" in r.keys():
-                    raise Exception(r["content"])
-                else:
+            r = requests.post('https://diagnosis.yunohost.org/check-ports', json={'ports': ports.keys()}, timeout=30)
+            if r.status_code == 200:
+                r = r.json()
+                if "status" not in r.keys():
                     raise Exception("Bad syntax for response ? Raw json: %s" % str(r))
-            elif r["status"] != "ok" or "ports" not in r.keys() or not isinstance(r["ports"], dict):
-                raise Exception("Bad syntax for response ? Raw json: %s" % str(r))
+                elif r["status"] == "error":
+                    if "content" in r.keys():
+                        raise Exception(r["content"])
+                    else:
+                        raise Exception("Bad syntax for response ? Raw json: %s" % str(r))
+                elif r["status"] != "ok" or "ports" not in r.keys() or not isinstance(r["ports"], dict):
+                    raise Exception("Bad syntax for response ? Raw json: %s" % str(r))
+            else:
+                raise Exception("Bad response from the server https://diagnosis.yunohost.org : %s" % str(r.status_code))
         except Exception as e:
             raise YunohostError("diagnosis_ports_could_not_diagnose", error=e)
 
diff --git a/data/hooks/diagnosis/16-http.py b/data/hooks/diagnosis/16-http.py
index c7955c805..ac30dad78 100644
--- a/data/hooks/diagnosis/16-http.py
+++ b/data/hooks/diagnosis/16-http.py
@@ -28,14 +28,18 @@ class HttpDiagnoser(Diagnoser):
             os.system("touch /tmp/.well-known/ynh-diagnosis/%s" % nonce)
 
             try:
-                r = requests.post('https://diagnosis.yunohost.org/check-http', json={'domain': domain, "nonce": nonce}, timeout=30).json()
-                if "status" not in r.keys():
-                    raise Exception("Bad syntax for response ? Raw json: %s" % str(r))
-                elif r["status"] == "error" and ("code" not in r.keys() or not r["code"].startswith("error_http_check_")):
-                    if "content" in r.keys():
-                        raise Exception(r["content"])
-                    else:
+                r = requests.post('https://diagnosis.yunohost.org/check-http', json={'domain': domain, "nonce": nonce}, timeout=30)
+                if r.status_code == 200:
+                    r = r.json()
+                    if "status" not in r.keys():
                         raise Exception("Bad syntax for response ? Raw json: %s" % str(r))
+                    elif r["status"] == "error" and ("code" not in r.keys() or not r["code"].startswith("error_http_check_")):
+                        if "content" in r.keys():
+                            raise Exception(r["content"])
+                        else:
+                            raise Exception("Bad syntax for response ? Raw json: %s" % str(r))
+                else:
+                    raise Exception("Bad response from the server https://diagnosis.yunohost.org : %s" % str(r.status_code))
             except Exception as e:
                 raise YunohostError("diagnosis_http_could_not_diagnose", error=e)