diff --git a/py-scripts/lf_interop_ping_plotter.py b/py-scripts/lf_interop_ping_plotter.py
index ae734aeb1..a3d22d18b 100755
--- a/py-scripts/lf_interop_ping_plotter.py
+++ b/py-scripts/lf_interop_ping_plotter.py
@@ -431,9 +431,8 @@ def check_tab_exists(self):
         response = self.json_get("generic")
         if response is None:
             logger.error("GET /generic returned no response; Generic tab may not be available on the LANforge manager.")
-            return False
-        else:
-            return True
+            raise RuntimeError("Generic tab is not available on the LANforge manager.")
+        return True
 
     def create_generic_endp(self):
         # Virtual stations are tracked in same list as real stations, so need to separate them
@@ -3486,9 +3485,7 @@ def main():
         ping.buildstation()
 
     # check if generic tab is enabled or not
-    if not ping.check_tab_exists():
-        logging.error('Generic Tab is not available.\nAborting the test.')
-        exit(0)
+    ping.check_tab_exists()
 
     ping.sta_list += ping.real_sta_list