From c4fd846451d19ee47a22c3957b63fde20c6b6dd1 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Fri, 12 Mar 2021 12:49:53 +0100
Subject: [PATCH] Move error to the is valid check

---
 .../service/developer-tools-service.ts          | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/panels/developer-tools/service/developer-tools-service.ts b/src/panels/developer-tools/service/developer-tools-service.ts
index 1279258693..70aa026a39 100644
--- a/src/panels/developer-tools/service/developer-tools-service.ts
+++ b/src/panels/developer-tools/service/developer-tools-service.ts
@@ -199,6 +199,15 @@ class HaPanelDevService extends LitElement {
     if (!serviceData?.service) {
       return false;
     }
+
+    this._error = undefined;
+    if (hasTemplate(this._serviceData!)) {
+      this._error = this.hass.localize(
+        "ui.panel.developer-tools.tabs.services.no_templates"
+      );
+      return false;
+    }
+
     const domain = computeDomain(serviceData.service);
     const service = computeObjectId(serviceData.service);
     if (!domain || !service) {
@@ -260,14 +269,6 @@ class HaPanelDevService extends LitElement {
       return;
     }
 
-    this._error = undefined;
-    if (hasTemplate(this._serviceData!)) {
-      this._error = this.hass.localize(
-        "ui.panel.developer-tools.tabs.services.no_templates"
-      );
-      return;
-    }
-
     this.hass.callService(
       domain,
       service,