diff --git a/CHANGELOG b/CHANGELOG
index 1f85b9a69eb89b145de6f83ccb0a58558d605764..03c30da2e084fcdf92994dac429ca17247b4a96f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,4 +9,6 @@
 2021-02-08: renamed to inv_checkpoint_base
             transfered license/support info to seperate plugin
 2021-02-22: code cleanup
-2021-03-05: added hostlabel section
\ No newline at end of file
+2021-03-05: added hostlabel section
+2021-03-18: fixed missing update agent snmp section.
+2021-07-24: fixed parse function for empty string_table
\ No newline at end of file
diff --git a/agent_based/inv_checkpoint_base.py b/agent_based/inv_checkpoint_base.py
index ceda8dab384bbb69a6f7f18eea917783a39a88f2..54e1713ba36bd9e40ee5218b512274427bea4d22 100644
--- a/agent_based/inv_checkpoint_base.py
+++ b/agent_based/inv_checkpoint_base.py
@@ -5,16 +5,17 @@
 #
 # Check Point base inventory
 #
-# 2016-06-29 : inventory Check Point Appliance
-# 2018-03-05 : added Patches, Deployment Agent Build
-# 2018-03-07 : added Licenses
-# 2020-06-01 : cleanup, prepared for cmk1.7x, rename from inv_checkpoint_svn to checkpoint_inv_base
-# 2020-11-27 : rewrite for CMK check API 1.0 (CMK 2.0)
-# 2020-11-28 : added available updates
-# 2021-02-08 : transfered license/support info to seperate plugin
-# 2021-02-22 : code cleanup
-# 2021-03-05 : added hostlabel section
-# 2021-03-18 : fixed missing update agent snmp section.
+# 2016-06-29: inventory Check Point Appliance
+# 2018-03-05: added Patches, Deployment Agent Build
+# 2018-03-07: added Licenses
+# 2020-06-01: cleanup, prepared for cmk1.7x, rename from inv_checkpoint_svn to checkpoint_inv_base
+# 2020-11-27: rewrite for CMK check API 1.0 (CMK 2.0)
+# 2020-11-28: added available updates
+# 2021-02-08: transfered license/support info to seperate plugin
+# 2021-02-22: code cleanup
+# 2021-03-05: added hostlabel section
+# 2021-03-18: fixed missing update agent snmp section.
+# 2021-07-24: fixed parse function for empty string_table
 #
 # sample string_table
 # [
@@ -27,7 +28,7 @@
 # ]
 #
 
-from typing import List, NamedTuple
+from typing import List, NamedTuple, Optional
 
 from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import (
     HostLabelGenerator,
@@ -46,7 +47,7 @@ from cmk.base.plugins.agent_based.agent_based_api.v1 import (
 )
 
 
-def parse_inv_checkpoint_base(string_table: List[StringTable]) -> List:
+def parse_inv_checkpoint_base(string_table: List[StringTable]) -> Optional[List]:
     class CheckpointInvBaseInfo(NamedTuple):
         serialnumber: str
         productname: str
@@ -58,6 +59,9 @@ def parse_inv_checkpoint_base(string_table: List[StringTable]) -> List:
         osmajorver: str
         osminorver: str
 
+    if string_table == [[], []]:
+        return
+
     section = []
     baseinfo = CheckpointInvBaseInfo(*string_table[0][0])
 
diff --git a/inv_checkpoint_base.mkp b/inv_checkpoint_base.mkp
index e31aaddcfce0c4bf175ef0d8df63837a49777426..eb705dee966850df8746794934c10a29ea862d9e 100644
Binary files a/inv_checkpoint_base.mkp and b/inv_checkpoint_base.mkp differ
diff --git a/packages/inv_checkpoint_base b/packages/inv_checkpoint_base
index 947af7b32d5be285846c8cbda5c1603806b59d34..d9f117d665fd72c9dafa9f77b622f8248816bad9 100644
--- a/packages/inv_checkpoint_base
+++ b/packages/inv_checkpoint_base
@@ -11,7 +11,7 @@
  'name': 'inv_checkpoint_base',
  'num_files': 2,
  'title': 'Check Point appliance base inventory plugin',
- 'version': '20210318.v.0.1a',
+ 'version': '202100724.v.0.1a',
  'version.min_required': '2.0.0b8',
  'version.packaged': '2021.07.14',
  'version.usable_until': None}
\ No newline at end of file