diff --git a/agent_based/cisco_wlc.py b/agent_based/cisco_wlc.py
index b59170c6cc1e67f915bdd7bd6ad0dd37790b8638..20e42a1de63b3782fddcaeddc89637da559d55bc 100644
--- a/agent_based/cisco_wlc.py
+++ b/agent_based/cisco_wlc.py
@@ -22,7 +22,9 @@
 #             fixed _render_mac_address/_render_ip_address, code cleanup, removed WIPS check
 #             added lwap_uptime/time taken to join. changed perfdata to 1/s
 # 2021-07-29: fix missing data from discovery (inv_ap_info)
+# 2022-03-07: fixed handling of missing AP (THX to andreas[dot]doehler[at]gmail[dot]com
 #
+
 from time import time
 from dataclasses import dataclass
 from typing import Optional, List, Dict
@@ -348,7 +350,6 @@ def check_cisco_wlc(item, params, section: Dict[str, Ap]) -> CheckResult:
         if item == ap_name:
             yield Result(state=State.OK, summary=f'Alias: {ap_alias}')
 
-    ap = Ap
     try:
         ap = section[item]
     except KeyError:
@@ -373,6 +374,7 @@ def check_cisco_wlc(item, params, section: Dict[str, Ap]) -> CheckResult:
             state=State(ap_missing_state),
             summary=f'AP {item} not found in SNMP data. For more information see check details (long output)',
         )
+        return
 
     ap_info = ap.ap_info
     cdp_info = ap.cdp_info
diff --git a/cisco_wlc.mkp b/cisco_wlc.mkp
index 3a6e30fa5174c0305063823b0174f6f88483e865..32d7e0a1bde94c80fdfe7269318072c458ff517a 100644
Binary files a/cisco_wlc.mkp and b/cisco_wlc.mkp differ
diff --git a/packages/cisco_wlc b/packages/cisco_wlc
index 35ca9e11f292c2323c972af076dfec70b411cf29..b6b30c5233fc0238e485c69a5b4b143204634f12 100644
--- a/packages/cisco_wlc
+++ b/packages/cisco_wlc
@@ -14,7 +14,7 @@
  'name': 'cisco_wlc',
  'num_files': 3,
  'title': 'monitor Cisco WLC APs',
- 'version': '20210730.v0.5b',
+ 'version': '20220307.v0.5c',
  'version.min_required': '2.0.0',
  'version.packaged': '2021.09.20',
  'version.usable_until': None}
\ No newline at end of file
diff --git a/web/plugins/wato/cisco_wlc.py b/web/plugins/wato/cisco_wlc.py
index e4b1a2cab0dcde2a9b265604c2bd6a3d8247daa9..4319a31b1c8c8c3499ad80126f2b73fa91fa5449 100644
--- a/web/plugins/wato/cisco_wlc.py
+++ b/web/plugins/wato/cisco_wlc.py
@@ -122,8 +122,7 @@ def _parameter_valuespec_cisco_wlc():
                      ]
                  ),
                  title=_('AP alias'),
-                 add_label=_('Add name'))
-             ),
+                 add_label=_('Add name'))),
         ])