diff --git a/README.md b/README.md
index dfc7b17db680b740bb4d0e6ab5632f85aee03ee1..bdc138b0fb2bbca37976657d16604954489d67a7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[PACKAGE]: ../../raw/master/mkp/vsphere_topo-0.0.7-20240801.mkp "vsphere_topo-0.0.7-20240801.mkp"
+[PACKAGE]: ../../raw/master/mkp/vsphere_topo-0.0.8-20240806.mkp "vsphere_topo-0.0.8-20240806.mkp"
 # vSphere Topology Visualization
 
 This plugin uses the data from the _VMware ESX via vSphere_ special agent to create a topology of the vSphere environment.\
diff --git a/mkp/vsphere_topo-0.0.8-20240806.mkp b/mkp/vsphere_topo-0.0.8-20240806.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..730a70385a0301a54340ee163f7c6cb37c607c00
Binary files /dev/null and b/mkp/vsphere_topo-0.0.8-20240806.mkp differ
diff --git a/source/cmk_addons_plugins/vsphere_topo/agent_based/vsphere_topo.py b/source/cmk_addons_plugins/vsphere_topo/agent_based/vsphere_topo.py
index 6510d67230139225c940e3211d0d1dc734e87d47..0d2f9a468a1e7a1286062774b3bf7bf32358e89f 100644
--- a/source/cmk_addons_plugins/vsphere_topo/agent_based/vsphere_topo.py
+++ b/source/cmk_addons_plugins/vsphere_topo/agent_based/vsphere_topo.py
@@ -22,7 +22,7 @@
 # 2024-07-29: added option to ignore powered off VMs
 #             added option to ignore VMs by name (regex)
 # 2024-07-31: added option to map vSphere names to CMK/topology names for data center, cluster, hosts and VMs
-
+# 2024-08-06: fixed crash on mapping vm_name
 from collections.abc import Mapping, Sequence
 from re import compile as re_compile
 from time import time_ns
@@ -244,7 +244,7 @@ def check_vsphere_topo(
     if (vm_to_data_stores := ls_connection.query(query=query)) is not None:
         for vm, data_stores in vm_to_data_stores:
             vm_name: str = adjust_name(vm, params.get(PARAM_VM_NAMES, {}))
-            vm_name = name_map(vm_name, vm_name)
+            vm_name = name_map.get(vm_name, vm_name)
             if vm_name in objects.topo_objects:
                 data_stores = data_stores.split(',')
                 for data_store in data_stores:
diff --git a/source/packages/vsphere_topo b/source/packages/vsphere_topo
index f5b7d53ec66f08f8d847e07ded08a8b927739c27..2e2778ca5dd992121027490b933eb3e6ad1fb448 100644
--- a/source/packages/vsphere_topo
+++ b/source/packages/vsphere_topo
@@ -13,7 +13,7 @@
                                   'vsphere_topo/rulesets/vsphere_topo.py']},
  'name': 'vsphere_topo',
  'title': 'vSphere Topologie',
- 'version': '0.0.7-20240801',
+ 'version': '0.0.8-20240806',
  'version.min_required': '2.3.0b1',
  'version.packaged': 'cmk-mkp-tool 0.2.0',
  'version.usable_until': '2.4.0b1'}