From f21ed24a49f86f9b5bdc50d42d4049e3e529cd8f Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 19 Apr 2021 22:58:39 -1000
Subject: [PATCH] Make error optional in connection lost service check (#8937)

---
 src/panels/developer-tools/service/developer-tools-service.ts | 2 +-
 src/state/connection-mixin.ts                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/panels/developer-tools/service/developer-tools-service.ts b/src/panels/developer-tools/service/developer-tools-service.ts
index b72fb01a40..69c6a84c43 100644
--- a/src/panels/developer-tools/service/developer-tools-service.ts
+++ b/src/panels/developer-tools/service/developer-tools-service.ts
@@ -282,7 +282,7 @@ class HaPanelDevService extends LitElement {
     } catch (err) {
       const [domain, service] = this._serviceData.service.split(".", 2);
       if (
-        err.error.code === ERR_CONNECTION_LOST &&
+        err.error?.code === ERR_CONNECTION_LOST &&
         serviceCallWillDisconnect(domain, service)
       ) {
         return;
diff --git a/src/state/connection-mixin.ts b/src/state/connection-mixin.ts
index 8785f4dada..51406ad3d4 100644
--- a/src/state/connection-mixin.ts
+++ b/src/state/connection-mixin.ts
@@ -81,7 +81,7 @@ export const connectionMixin = <T extends Constructor<HassBaseEl>>(
             )) as Promise<ServiceCallResponse>;
           } catch (err) {
             if (
-              err.error.code === ERR_CONNECTION_LOST &&
+              err.error?.code === ERR_CONNECTION_LOST &&
               serviceCallWillDisconnect(domain, service)
             ) {
               throw err;