diff --git a/CHANGELOG b/CHANGELOG
index 9e210a7487a086b7355f920b1155d6fc079615e5..b8d21de6eb93453a915096b7fffd8bab83f05faf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,3 +32,4 @@
 2023-01-22: fix output for admin_state
 2023-02-16: changed for CMK 2.1 (moved gui files from local/share/.. to local/lib/..)
             fix type error in discovery (CMK2.1 GUI only) 
+2023-02-20: fix crash if metric data is None
diff --git a/agent_based/bgp_peer.py b/agent_based/bgp_peer.py
index 7e9e957ed563c50b88fc387005c4a6f803ff8ace..65530c3e99ea1f8a45b65c3182acd1aa624097f0 100644
--- a/agent_based/bgp_peer.py
+++ b/agent_based/bgp_peer.py
@@ -30,6 +30,7 @@
 # 2023-01-22: fix output for admin_state
 # 2023-02-16: changed for CMK 2.1 (moved gui files from local/share/.. to local/lib/..)
 #             fix type error in discovery (CMK2.1 GUI only)
+# 2023-02-20: fix crash if metric data is None
 
 # Example Agent Output:
 # BGP4-MIB
@@ -207,7 +208,8 @@ def check_bgp_peer(item, params, section: Dict[str, BgpPeer]) -> CheckResult:
 
     for entry in peer.metric_count:
         key, value = entry
-        yield Metric(name=f'bgp_peer_{key}', value=value, boundaries=(0, None))
+        if value is not None:
+            yield Metric(name=f'bgp_peer_{key}', value=value, boundaries=(0, None))
 
 
 register.snmp_section(
diff --git a/bgp_peer.mkp b/bgp_peer.mkp
index 13f591316bdbbeb00de2a499492e0df732a0abd8..bdf946b84f571cbe0512fd684bc22f6330222eff 100644
Binary files a/bgp_peer.mkp and b/bgp_peer.mkp differ
diff --git a/packages/bgp_peer b/packages/bgp_peer
index abed79f42927b19cb73d5de2901d52106350ebaa..5420e204271ae7102debaa11b42a174ce04ccb4c 100644
--- a/packages/bgp_peer
+++ b/packages/bgp_peer
@@ -19,7 +19,7 @@
                    'wato/inv_bgp_peer.py']},
  'name': 'bgp_peer',
  'title': 'BGP Peer',
- 'version': '20230217.v2.0.0',
+ 'version': '20230220.v2.0.1',
  'version.min_required': '2.1.0',
  'version.packaged': '2.1.0p21',
  'version.usable_until': None}
\ No newline at end of file