diff --git a/src/renderer/api/__tests__/endpoint.api.test.ts b/src/renderer/api/__tests__/endpoint.api.test.ts
new file mode 100644
index 0000000000..c7a897544b
--- /dev/null
+++ b/src/renderer/api/__tests__/endpoint.api.test.ts
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2021 OpenLens Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+import { EndpointSubset } from "../endpoints";
+
+describe("endpoint tests", () => {
+  describe("EndpointSubset", () => {
+    it.each([
+      4,
+      false,
+      null,
+      {},
+      [],
+      "ahe",
+      /a/,
+    ])("should always initialize fields when given %j", (data: any) => {
+      const sub = new EndpointSubset(data);
+
+      expect(sub.addresses).toStrictEqual([]);
+      expect(sub.notReadyAddresses).toStrictEqual([]);
+      expect(sub.ports).toStrictEqual([]);
+    });
+
+    it("toString should be addresses X ports", () => {
+      const sub = new EndpointSubset({
+        addresses: [{
+          ip: "1.1.1.1",
+        }, {
+          ip: "1.1.1.2",
+        }] as any,
+        notReadyAddresses: [],
+        ports: [{
+          port: "81",
+        }, {
+          port: "82",
+        }] as any,
+      });
+
+      expect(sub.toString()).toBe("1.1.1.1:81, 1.1.1.1:82, 1.1.1.2:81, 1.1.1.2:82");
+    });
+  });
+});
diff --git a/src/renderer/api/endpoints/endpoint.api.ts b/src/renderer/api/endpoints/endpoint.api.ts
index 9aa1701c1d..14bc399062 100644
--- a/src/renderer/api/endpoints/endpoint.api.ts
+++ b/src/renderer/api/endpoints/endpoint.api.ts
@@ -23,6 +23,7 @@ import { autoBind } from "../../utils";
 import { KubeObject } from "../kube-object";
 import { KubeApi } from "../kube-api";
 import type { KubeJsonApiData } from "../kube-json-api";
+import { get } from "lodash";
 
 export interface IEndpointPort {
   name?: string;
@@ -63,6 +64,10 @@ export class EndpointAddress implements IEndpointAddress {
     resourceVersion: string;
   };
 
+  static create(data: IEndpointAddress): EndpointAddress {
+    return new EndpointAddress(data);
+  }
+
   constructor(data: IEndpointAddress) {
     Object.assign(this, data);
   }
@@ -90,35 +95,27 @@ export class EndpointSubset implements IEndpointSubset {
   ports: IEndpointPort[];
 
   constructor(data: IEndpointSubset) {
-    Object.assign(this, data);
+    this.addresses = get(data, "addresses", []);
+    this.notReadyAddresses = get(data, "notReadyAddresses", []);
+    this.ports = get(data, "ports", []);
   }
 
   getAddresses(): EndpointAddress[] {
-    const addresses = this.addresses || [];
-
-    return addresses.map(a => new EndpointAddress(a));
+    return this.addresses.map(EndpointAddress.create);
   }
 
   getNotReadyAddresses(): EndpointAddress[] {
-    const notReadyAddresses = this.notReadyAddresses || [];
-
-    return notReadyAddresses.map(a => new EndpointAddress(a));
+    return this.notReadyAddresses.map(EndpointAddress.create);
   }
 
   toString(): string {
-    if(!this.addresses) {
-      return "";
-    }
-
-    return this.addresses.map(address => {
-      if (!this.ports) {
-        return address.ip;
-      }
-
-      return this.ports.map(port => {
-        return `${address.ip}:${port.port}`;
-      }).join(", ");
-    }).join(", ");
+    return this.addresses
+      .map(address => (
+        this.ports
+          .map(port => `${address.ip}:${port.port}`)
+          .join(", ")
+      ))
+      .join(", ");
   }
 }