diff --git a/plinth/modules/diagnostics/templates/diagnostics_app.html b/plinth/modules/diagnostics/templates/diagnostics_app.html
index 3b3d6e872..c2665ccff 100644
--- a/plinth/modules/diagnostics/templates/diagnostics_app.html
+++ b/plinth/modules/diagnostics/templates/diagnostics_app.html
@@ -25,16 +25,6 @@
 
     {% if results %}
       {% include "diagnostics_results.html" with results=results %}
-    {% elif exception %}
-      <div class="alert alert-danger d-flex align-items-center" role="alert">
-        <div class="me-2">
-          <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
-          <span class="visually-hidden">{% trans "Caution:" %}</span>
-        </div>
-        <div>
-          {{ exception }}
-        </div>
-      </div>
     {% else %}
       <p>{% trans "This app does not support diagnostics" %}</p>
     {% endif %}
diff --git a/plinth/modules/diagnostics/views.py b/plinth/modules/diagnostics/views.py
index f3a73f2be..bac8c0b2d 100644
--- a/plinth/modules/diagnostics/views.py
+++ b/plinth/modules/diagnostics/views.py
@@ -103,17 +103,9 @@ def diagnose_app(request, app_id):
         app = App.get(app_id)
     except KeyError:
         raise Http404('App does not exist')
+
     app_name = app.info.name or app_id
-
-    diagnosis = None
-    diagnosis_exception = None
-    try:
-        diagnosis = app.diagnose()
-    except Exception as exception:
-        logger.exception('Error running %s diagnostics - %s', app_id,
-                         exception)
-        diagnosis_exception = str(exception)
-
+    diagnosis = app.diagnose()
     show_repair = False
     for check in diagnosis:
         if check.result in [Result.FAILED, Result.WARNING]:
@@ -126,7 +118,6 @@ def diagnose_app(request, app_id):
             'app_id': app_id,
             'app_name': app_name,
             'results': diagnosis,
-            'exception': diagnosis_exception,
             'show_repair': show_repair,
         })