diff --git a/netbox_topology_views/__init__.py b/netbox_topology_views/__init__.py
index a19fc6d..eec6841 100644
--- a/netbox_topology_views/__init__.py
+++ b/netbox_topology_views/__init__.py
@@ -4,7 +4,7 @@ class TopologyViewsConfig(PluginConfig):
     name = 'netbox_topology_views'
     verbose_name = 'Topology views'
     description = 'An plugin to render toplogoy maps'
-    version = '0.4.7'
+    version = '0.4.8'
     author = 'Mattijs Vanhaverbeke'
     author_email = 'author@example.com'
     base_url = 'topology-views'
diff --git a/netbox_topology_views/api/views.py b/netbox_topology_views/api/views.py
index 5a47975..76295f7 100644
--- a/netbox_topology_views/api/views.py
+++ b/netbox_topology_views/api/views.py
@@ -175,34 +175,40 @@ class SearchViewSet(GenericViewSet):
                                 title += "Circuit provider: "  + cable.termination_a.circuit.provider.name + "<br>"
                                 title += "Termination between <br>"
                                 title += cable_b_dev_name + " [" + cable_b_name +  "]<br>"
+                                # To Many if's
                                 if cable.termination_a.circuit.termination_a is not None:
                                     if cable.termination_a.circuit.termination_a.cable is not None:
                                         if cable.termination_a.circuit.termination_a.cable.id != cable.id:
-                                            edge["from"] = cable.termination_a.circuit.termination_a.cable.termination_b.device.id
+                                            if cable.termination_a.circuit.termination_a.cable.termination_b is not None:
+                                                if cable.termination_a.circuit.termination_a.cable.termination_b.device is not None:
+                                                    edge["from"] = cable.termination_a.circuit.termination_a.cable.termination_b.device.id
 
-                                            cable_a_dev_name = cable.termination_a.circuit.termination_a.cable.termination_b.device.name
-                                            if cable_a_dev_name is None:
-                                                cable_a_dev_name = "device B name unknown"
-                                            cable_b_name = cable.termination_a.circuit.termination_a.cable.termination_b.name
-                                            if cable_a_name is None:
-                                                cable_a_name = "cable B name unknown"
-                                            title += cable_a_dev_name + " [" + cable_a_name +  "]<br>"
+                                                    cable_a_dev_name = cable.termination_a.circuit.termination_a.cable.termination_b.device.name
+                                                    if cable_a_dev_name is None:
+                                                        cable_a_dev_name = "device B name unknown"
+                                                    cable_b_name = cable.termination_a.circuit.termination_a.cable.termination_b.name
+                                                    if cable_a_name is None:
+                                                        cable_a_name = "cable B name unknown"
+                                                    title += cable_a_dev_name + " [" + cable_a_name +  "]<br>"
+                                                    edge["title"] = title
+                                                    edges.append(edge)
+                                # To Many if's
                                 if cable.termination_a.circuit.termination_z is not None:
                                     if cable.termination_a.circuit.termination_z.cable is not None:
                                         if cable.termination_a.circuit.termination_z.cable.id != cable.id:
-                                            edge["from"] = cable.termination_a.circuit.termination_z.cable.termination_b.device.id
+                                            if cable.termination_a.circuit.termination_z.cable.termination_b is not None:
+                                                if cable.termination_a.circuit.termination_z.cable.termination_b.device is not None:
+                                                    edge["from"] = cable.termination_a.circuit.termination_z.cable.termination_b.device.id
 
-                                            cable_a_dev_name = cable.termination_a.circuit.termination_z.cable.termination_b.device.name
-                                            if cable_a_dev_name is None:
-                                                cable_a_dev_name = "device B name unknown"
-                                            cable_a_name = cable.termination_a.circuit.termination_z.cable.termination_b.name
-                                            if cable_a_name is None:
-                                                cable_a_name = "cable B name unknown"
-                                            title += cable_a_dev_name + " [" + cable_a_name +  "]<br>"
-
-                                edge["title"] = title
-                                edges.append(edge)
-                
+                                                    cable_a_dev_name = cable.termination_a.circuit.termination_z.cable.termination_b.device.name
+                                                    if cable_a_dev_name is None:
+                                                        cable_a_dev_name = "device B name unknown"
+                                                    cable_a_name = cable.termination_a.circuit.termination_z.cable.termination_b.name
+                                                    if cable_a_name is None:
+                                                        cable_a_name = "cable B name unknown"
+                                                    title += cable_a_dev_name + " [" + cable_a_name +  "]<br>"
+                                                    edge["title"] = title
+                                                    edges.append(edge)
             dev_name = device.name
             if dev_name is None:
                 dev_name = "device name unknown"
diff --git a/package.json b/package.json
index 18c0514..05805cc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "netbox_topology_views",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "scripts": {
     "resources": "gulp build",
     "resources_dev": "gulp build_dev"
diff --git a/setup.py b/setup.py
index 175b6db..a474bee 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='netbox-topology-views',
-    version='0.4.7',
+    version='0.4.8',
     description='An NetBox plugin to create Topology maps',
     url='https://github.com/mattieserver/netbox-topology-views',
     author='Mattijs Vanhaverbeke',