diff --git a/modules/parsers/MACO/AgentTesla.py b/modules/parsers/MACO/AgentTesla.py
index 72de7988..f2756ab8 100644
--- a/modules/parsers/MACO/AgentTesla.py
+++ b/modules/parsers/MACO/AgentTesla.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict) -> MACOModel:
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return
 
     protocol = raw_config.get("Protocol")
diff --git a/modules/parsers/MACO/AsyncRAT.py b/modules/parsers/MACO/AsyncRAT.py
index afc2ee7b..d96ce44d 100644
--- a/modules/parsers/MACO/AsyncRAT.py
+++ b/modules/parsers/MACO/AsyncRAT.py
@@ -8,7 +8,7 @@
 
 
 def convert_to_MACO(raw_config: dict) -> MACOModel:
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return
 
     parsed_result = MACOModel(family="AsyncRAT", other=raw_config)
diff --git a/modules/parsers/MACO/AuroraStealer.py b/modules/parsers/MACO/AuroraStealer.py
index e6c51226..1ec6da51 100644
--- a/modules/parsers/MACO/AuroraStealer.py
+++ b/modules/parsers/MACO/AuroraStealer.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="AuroraStealer", other=raw_config)
diff --git a/modules/parsers/MACO/Azorult.py b/modules/parsers/MACO/Azorult.py
index 21e5ad7e..3e29420f 100644
--- a/modules/parsers/MACO/Azorult.py
+++ b/modules/parsers/MACO/Azorult.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     return MACOModel(
diff --git a/modules/parsers/MACO/BackOffLoader.py b/modules/parsers/MACO/BackOffLoader.py
index f3cf38ce..466d75f5 100644
--- a/modules/parsers/MACO/BackOffLoader.py
+++ b/modules/parsers/MACO/BackOffLoader.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="BackOffLoader", other=raw_config)
diff --git a/modules/parsers/MACO/BackOffPOS.py b/modules/parsers/MACO/BackOffPOS.py
index c82efd65..11f05ec6 100644
--- a/modules/parsers/MACO/BackOffPOS.py
+++ b/modules/parsers/MACO/BackOffPOS.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="BackOffPOS", other=raw_config)
diff --git a/modules/parsers/MACO/BitPaymer.py b/modules/parsers/MACO/BitPaymer.py
index 6fb53326..23fe653d 100644
--- a/modules/parsers/MACO/BitPaymer.py
+++ b/modules/parsers/MACO/BitPaymer.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="BitPaymer", other=raw_config)
diff --git a/modules/parsers/MACO/BlackDropper.py b/modules/parsers/MACO/BlackDropper.py
index 888f03d4..14f52944 100644
--- a/modules/parsers/MACO/BlackDropper.py
+++ b/modules/parsers/MACO/BlackDropper.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="BlackDropper", campaign_id=[raw_config["campaign"]], other=raw_config)
diff --git a/modules/parsers/MACO/BlackNix.py b/modules/parsers/MACO/BlackNix.py
index d8ed7041..e488e6e3 100644
--- a/modules/parsers/MACO/BlackNix.py
+++ b/modules/parsers/MACO/BlackNix.py
@@ -8,7 +8,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="BlackNix", other=raw_config)
diff --git a/modules/parsers/MACO/Blister.py b/modules/parsers/MACO/Blister.py
index a9f20d0f..d85c59a9 100644
--- a/modules/parsers/MACO/Blister.py
+++ b/modules/parsers/MACO/Blister.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Blister", other=raw_config)
diff --git a/modules/parsers/MACO/BruteRatel.py b/modules/parsers/MACO/BruteRatel.py
index a07326d5..e3016fa2 100644
--- a/modules/parsers/MACO/BruteRatel.py
+++ b/modules/parsers/MACO/BruteRatel.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="BruteRatel", other=raw_config)
diff --git a/modules/parsers/MACO/BuerLoader.py b/modules/parsers/MACO/BuerLoader.py
index b033bf04..3065323f 100644
--- a/modules/parsers/MACO/BuerLoader.py
+++ b/modules/parsers/MACO/BuerLoader.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="BuerLoader", other=raw_config)
diff --git a/modules/parsers/MACO/BumbleBee.py b/modules/parsers/MACO/BumbleBee.py
index 9e1a1608..f017737d 100644
--- a/modules/parsers/MACO/BumbleBee.py
+++ b/modules/parsers/MACO/BumbleBee.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="BumbleBee", other=raw_config)
diff --git a/modules/parsers/MACO/Carbanak.py b/modules/parsers/MACO/Carbanak.py
index a805e196..a5497622 100644
--- a/modules/parsers/MACO/Carbanak.py
+++ b/modules/parsers/MACO/Carbanak.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Carbanak", other=raw_config)
diff --git a/modules/parsers/MACO/ChChes.py b/modules/parsers/MACO/ChChes.py
index 21291d93..417fa3de 100644
--- a/modules/parsers/MACO/ChChes.py
+++ b/modules/parsers/MACO/ChChes.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="ChChes", other=raw_config)
diff --git a/modules/parsers/MACO/CobaltStrikeBeacon.py b/modules/parsers/MACO/CobaltStrikeBeacon.py
index 76a56600..ba0e141d 100644
--- a/modules/parsers/MACO/CobaltStrikeBeacon.py
+++ b/modules/parsers/MACO/CobaltStrikeBeacon.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="CobaltStrikeBeacon", other=raw_config)
diff --git a/modules/parsers/MACO/CobaltStrikeStager.py b/modules/parsers/MACO/CobaltStrikeStager.py
index 37cbfd18..050c693a 100644
--- a/modules/parsers/MACO/CobaltStrikeStager.py
+++ b/modules/parsers/MACO/CobaltStrikeStager.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="CobaltStrikeStager", other=raw_config)
diff --git a/modules/parsers/MACO/DCRat.py b/modules/parsers/MACO/DCRat.py
index 44a71818..a4fd6ac3 100644
--- a/modules/parsers/MACO/DCRat.py
+++ b/modules/parsers/MACO/DCRat.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     # TODO: Assign fields to MACO model
diff --git a/modules/parsers/MACO/DarkGate.py b/modules/parsers/MACO/DarkGate.py
index 8e75b231..d6cb63dc 100644
--- a/modules/parsers/MACO/DarkGate.py
+++ b/modules/parsers/MACO/DarkGate.py
@@ -8,7 +8,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="DarkGate", other=raw_config)
diff --git a/modules/parsers/MACO/DoppelPaymer.py b/modules/parsers/MACO/DoppelPaymer.py
index 19adace7..81f74a0e 100644
--- a/modules/parsers/MACO/DoppelPaymer.py
+++ b/modules/parsers/MACO/DoppelPaymer.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="DoppelPaymer")
diff --git a/modules/parsers/MACO/DridexLoader.py b/modules/parsers/MACO/DridexLoader.py
index dc193b9a..130fd7d1 100644
--- a/modules/parsers/MACO/DridexLoader.py
+++ b/modules/parsers/MACO/DridexLoader.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="DridexLoader", other=raw_config)
diff --git a/modules/parsers/MACO/Emotet.py b/modules/parsers/MACO/Emotet.py
index 04ac53fe..ddd498a3 100644
--- a/modules/parsers/MACO/Emotet.py
+++ b/modules/parsers/MACO/Emotet.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Emotet", other=raw_config)
diff --git a/modules/parsers/MACO/Enfal.py b/modules/parsers/MACO/Enfal.py
index 72c343be..6e72e213 100644
--- a/modules/parsers/MACO/Enfal.py
+++ b/modules/parsers/MACO/Enfal.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     # TODO: Assign fields to MACO model
diff --git a/modules/parsers/MACO/EvilGrab.py b/modules/parsers/MACO/EvilGrab.py
index 75a61ef4..04afdfb7 100644
--- a/modules/parsers/MACO/EvilGrab.py
+++ b/modules/parsers/MACO/EvilGrab.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="EvilGrab", other=raw_config)
diff --git a/modules/parsers/MACO/Fareit.py b/modules/parsers/MACO/Fareit.py
index ffb0a89f..14618d22 100644
--- a/modules/parsers/MACO/Fareit.py
+++ b/modules/parsers/MACO/Fareit.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     # TODO: Assign fields to MACO model
diff --git a/modules/parsers/MACO/Formbook.py b/modules/parsers/MACO/Formbook.py
index db596562..d03e7ee8 100644
--- a/modules/parsers/MACO/Formbook.py
+++ b/modules/parsers/MACO/Formbook.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Formbook", other=raw_config)
diff --git a/modules/parsers/MACO/Greame.py b/modules/parsers/MACO/Greame.py
index 3c2a3467..ee33c00d 100644
--- a/modules/parsers/MACO/Greame.py
+++ b/modules/parsers/MACO/Greame.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Greame", other=raw_config)
diff --git a/modules/parsers/MACO/GuLoader.py b/modules/parsers/MACO/GuLoader.py
index 31c08cf4..8f479d98 100644
--- a/modules/parsers/MACO/GuLoader.py
+++ b/modules/parsers/MACO/GuLoader.py
@@ -8,7 +8,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="GuLoader", other=raw_config)
diff --git a/modules/parsers/MACO/Hancitor.py_deprecated.py b/modules/parsers/MACO/Hancitor.py_deprecated.py
index f82287fa..a22851fb 100644
--- a/modules/parsers/MACO/Hancitor.py_deprecated.py
+++ b/modules/parsers/MACO/Hancitor.py_deprecated.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Hancitor", other=raw_config)
diff --git a/modules/parsers/MACO/HttpBrowser.py b/modules/parsers/MACO/HttpBrowser.py
index 4372f1c9..3959f645 100644
--- a/modules/parsers/MACO/HttpBrowser.py
+++ b/modules/parsers/MACO/HttpBrowser.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="HttpBrowser", other=raw_config)
diff --git a/modules/parsers/MACO/IcedID.py b/modules/parsers/MACO/IcedID.py
index 60d6edbf..d791787c 100644
--- a/modules/parsers/MACO/IcedID.py
+++ b/modules/parsers/MACO/IcedID.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     return MACOModel(**raw_config)
diff --git a/modules/parsers/MACO/IcedIDLoader.py b/modules/parsers/MACO/IcedIDLoader.py
index cc9f1e5c..eb79947a 100644
--- a/modules/parsers/MACO/IcedIDLoader.py
+++ b/modules/parsers/MACO/IcedIDLoader.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="IcedIDLoader", other=raw_config)
diff --git a/modules/parsers/MACO/KoiLoader.py b/modules/parsers/MACO/KoiLoader.py
index 365406b2..6835c1bb 100644
--- a/modules/parsers/MACO/KoiLoader.py
+++ b/modules/parsers/MACO/KoiLoader.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="KoiLoader", other=raw_config)
diff --git a/modules/parsers/MACO/Latrodectus.py b/modules/parsers/MACO/Latrodectus.py
index d3762ec3..e9760fd4 100644
--- a/modules/parsers/MACO/Latrodectus.py
+++ b/modules/parsers/MACO/Latrodectus.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Latrodectus", other=raw_config)
diff --git a/modules/parsers/MACO/LokiBot.py b/modules/parsers/MACO/LokiBot.py
index 1a3d8880..6d7eca42 100644
--- a/modules/parsers/MACO/LokiBot.py
+++ b/modules/parsers/MACO/LokiBot.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="LokiBot", other=raw_config)
diff --git a/modules/parsers/MACO/Lumma.py b/modules/parsers/MACO/Lumma.py
index ee232faa..ce4ee7cb 100644
--- a/modules/parsers/MACO/Lumma.py
+++ b/modules/parsers/MACO/Lumma.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Lumma", other=raw_config)
diff --git a/modules/parsers/MACO/NanoCore.py b/modules/parsers/MACO/NanoCore.py
index fb2761c6..210f072e 100644
--- a/modules/parsers/MACO/NanoCore.py
+++ b/modules/parsers/MACO/NanoCore.py
@@ -8,7 +8,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="NanoCore", other=raw_config)
diff --git a/modules/parsers/MACO/Nighthawk.py b/modules/parsers/MACO/Nighthawk.py
index b7dce90a..0a05e3ad 100644
--- a/modules/parsers/MACO/Nighthawk.py
+++ b/modules/parsers/MACO/Nighthawk.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Nighthawk", other=raw_config)
diff --git a/modules/parsers/MACO/Njrat.py b/modules/parsers/MACO/Njrat.py
index 93012657..a89589b1 100644
--- a/modules/parsers/MACO/Njrat.py
+++ b/modules/parsers/MACO/Njrat.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Njrat", other=raw_config)
diff --git a/modules/parsers/MACO/Oyster.py b/modules/parsers/MACO/Oyster.py
index 4ad8e108..200428a3 100644
--- a/modules/parsers/MACO/Oyster.py
+++ b/modules/parsers/MACO/Oyster.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Oyster", other=raw_config)
diff --git a/modules/parsers/MACO/Pandora.py b/modules/parsers/MACO/Pandora.py
index 5a831637..45026857 100644
--- a/modules/parsers/MACO/Pandora.py
+++ b/modules/parsers/MACO/Pandora.py
@@ -9,7 +9,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     config_copy = deepcopy(raw_config)
diff --git a/modules/parsers/MACO/PhemedroneStealer.py b/modules/parsers/MACO/PhemedroneStealer.py
index 31fa662b..4aefe8cd 100644
--- a/modules/parsers/MACO/PhemedroneStealer.py
+++ b/modules/parsers/MACO/PhemedroneStealer.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="PhemedroneStealer", other=raw_config)
diff --git a/modules/parsers/MACO/PikaBot.py b/modules/parsers/MACO/PikaBot.py
index 1c8855a7..95c35b13 100644
--- a/modules/parsers/MACO/PikaBot.py
+++ b/modules/parsers/MACO/PikaBot.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="PikaBot", other=raw_config)
diff --git a/modules/parsers/MACO/PlugX.py b/modules/parsers/MACO/PlugX.py
index 00da9e8a..55c47472 100644
--- a/modules/parsers/MACO/PlugX.py
+++ b/modules/parsers/MACO/PlugX.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="PlugX", other=raw_config)
diff --git a/modules/parsers/MACO/PoisonIvy.py b/modules/parsers/MACO/PoisonIvy.py
index ff352651..2b3068b8 100644
--- a/modules/parsers/MACO/PoisonIvy.py
+++ b/modules/parsers/MACO/PoisonIvy.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="PoisonIvy", other=raw_config)
diff --git a/modules/parsers/MACO/Punisher.py b/modules/parsers/MACO/Punisher.py
index 4ec01601..4a36d150 100644
--- a/modules/parsers/MACO/Punisher.py
+++ b/modules/parsers/MACO/Punisher.py
@@ -9,7 +9,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     config_copy = deepcopy(raw_config)
diff --git a/modules/parsers/MACO/QakBot.py b/modules/parsers/MACO/QakBot.py
index 4ab876f6..1be72f72 100644
--- a/modules/parsers/MACO/QakBot.py
+++ b/modules/parsers/MACO/QakBot.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="QakBot", other=raw_config)
diff --git a/modules/parsers/MACO/QuasarRAT.py b/modules/parsers/MACO/QuasarRAT.py
index 3097a83b..7952cf80 100644
--- a/modules/parsers/MACO/QuasarRAT.py
+++ b/modules/parsers/MACO/QuasarRAT.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="QuasarRAT", other=raw_config)
diff --git a/modules/parsers/MACO/Quickbind.py b/modules/parsers/MACO/Quickbind.py
index d4366957..932681c0 100644
--- a/modules/parsers/MACO/Quickbind.py
+++ b/modules/parsers/MACO/Quickbind.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Quickbind", other=raw_config)
diff --git a/modules/parsers/MACO/RCSession.py b/modules/parsers/MACO/RCSession.py
index 25aae160..f804bf81 100644
--- a/modules/parsers/MACO/RCSession.py
+++ b/modules/parsers/MACO/RCSession.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="RCSession", other=raw_config)
diff --git a/modules/parsers/MACO/REvil.py b/modules/parsers/MACO/REvil.py
index b0db3948..f659a777 100644
--- a/modules/parsers/MACO/REvil.py
+++ b/modules/parsers/MACO/REvil.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="REvil", other=raw_config)
diff --git a/modules/parsers/MACO/RedLeaf.py b/modules/parsers/MACO/RedLeaf.py
index 3a8f65ea..9743d1af 100644
--- a/modules/parsers/MACO/RedLeaf.py
+++ b/modules/parsers/MACO/RedLeaf.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="RedLeaf", other=raw_config)
diff --git a/modules/parsers/MACO/RedLine.py b/modules/parsers/MACO/RedLine.py
index b7edb4ab..ab481577 100644
--- a/modules/parsers/MACO/RedLine.py
+++ b/modules/parsers/MACO/RedLine.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="RedLine", other=raw_config)
diff --git a/modules/parsers/MACO/Remcos.py b/modules/parsers/MACO/Remcos.py
index a4cd42e0..65a8953b 100644
--- a/modules/parsers/MACO/Remcos.py
+++ b/modules/parsers/MACO/Remcos.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Remcos", other=raw_config)
diff --git a/modules/parsers/MACO/Retefe.py b/modules/parsers/MACO/Retefe.py
index ac2542dd..f734e278 100644
--- a/modules/parsers/MACO/Retefe.py
+++ b/modules/parsers/MACO/Retefe.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Retefe", other=raw_config)
diff --git a/modules/parsers/MACO/Rhadamanthys.py b/modules/parsers/MACO/Rhadamanthys.py
index 0bd98a7a..4cae5d6a 100644
--- a/modules/parsers/MACO/Rhadamanthys.py
+++ b/modules/parsers/MACO/Rhadamanthys.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Rhadamanthys", other=raw_config)
diff --git a/modules/parsers/MACO/Rozena.py b/modules/parsers/MACO/Rozena.py
index 79d25d10..dc101887 100644
--- a/modules/parsers/MACO/Rozena.py
+++ b/modules/parsers/MACO/Rozena.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Rozena", other=raw_config)
diff --git a/modules/parsers/MACO/SmallNet.py b/modules/parsers/MACO/SmallNet.py
index f0293cea..78d0fa0c 100644
--- a/modules/parsers/MACO/SmallNet.py
+++ b/modules/parsers/MACO/SmallNet.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="SmallNet", other=raw_config)
diff --git a/modules/parsers/MACO/SmokeLoader.py b/modules/parsers/MACO/SmokeLoader.py
index 9025c2a7..ad942098 100644
--- a/modules/parsers/MACO/SmokeLoader.py
+++ b/modules/parsers/MACO/SmokeLoader.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(
diff --git a/modules/parsers/MACO/Socks5Systemz.py b/modules/parsers/MACO/Socks5Systemz.py
index 6fdb5e4c..80aaff4f 100644
--- a/modules/parsers/MACO/Socks5Systemz.py
+++ b/modules/parsers/MACO/Socks5Systemz.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(
diff --git a/modules/parsers/MACO/SparkRAT.py b/modules/parsers/MACO/SparkRAT.py
index d8529f8d..0e459e52 100644
--- a/modules/parsers/MACO/SparkRAT.py
+++ b/modules/parsers/MACO/SparkRAT.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="SparkRAT", other=raw_config)
diff --git a/modules/parsers/MACO/SquirrelWaffle.py b/modules/parsers/MACO/SquirrelWaffle.py
index aee48d28..6071d93e 100644
--- a/modules/parsers/MACO/SquirrelWaffle.py
+++ b/modules/parsers/MACO/SquirrelWaffle.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(
diff --git a/modules/parsers/MACO/Stealc.py b/modules/parsers/MACO/Stealc.py
index bb0e8c0f..224edb65 100644
--- a/modules/parsers/MACO/Stealc.py
+++ b/modules/parsers/MACO/Stealc.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(
diff --git a/modules/parsers/MACO/Strrat.py b/modules/parsers/MACO/Strrat.py
index 712d3b8d..fb716ee5 100644
--- a/modules/parsers/MACO/Strrat.py
+++ b/modules/parsers/MACO/Strrat.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Strrat", other=raw_config)
diff --git a/modules/parsers/MACO/TSCookie.py b/modules/parsers/MACO/TSCookie.py
index 494bc380..6b4fe4e0 100644
--- a/modules/parsers/MACO/TSCookie.py
+++ b/modules/parsers/MACO/TSCookie.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="TSCookie", other=raw_config)
diff --git a/modules/parsers/MACO/TrickBot.py b/modules/parsers/MACO/TrickBot.py
index 2d277d2d..a955675f 100644
--- a/modules/parsers/MACO/TrickBot.py
+++ b/modules/parsers/MACO/TrickBot.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="TrickBot", other=raw_config)
diff --git a/modules/parsers/MACO/UrsnifV3.py b/modules/parsers/MACO/UrsnifV3.py
index b2b9df80..5099a8d0 100644
--- a/modules/parsers/MACO/UrsnifV3.py
+++ b/modules/parsers/MACO/UrsnifV3.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="UrsnifV3", other=raw_config)
diff --git a/modules/parsers/MACO/VenomRat.py b/modules/parsers/MACO/VenomRat.py
index 21dd65f9..2a463e10 100644
--- a/modules/parsers/MACO/VenomRat.py
+++ b/modules/parsers/MACO/VenomRat.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="VenomRAT", other=raw_config)
diff --git a/modules/parsers/MACO/WarzoneRAT.py b/modules/parsers/MACO/WarzoneRAT.py
index 415bf904..f77a3597 100644
--- a/modules/parsers/MACO/WarzoneRAT.py
+++ b/modules/parsers/MACO/WarzoneRAT.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="WarzoneRAT", other=raw_config)
diff --git a/modules/parsers/MACO/XWorm.py b/modules/parsers/MACO/XWorm.py
index b6c83d0c..12300c91 100644
--- a/modules/parsers/MACO/XWorm.py
+++ b/modules/parsers/MACO/XWorm.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="XWorm", other=raw_config)
diff --git a/modules/parsers/MACO/XenoRAT.py b/modules/parsers/MACO/XenoRAT.py
index edb84481..3d1913e3 100644
--- a/modules/parsers/MACO/XenoRAT.py
+++ b/modules/parsers/MACO/XenoRAT.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="XenoRAT", other=raw_config)
diff --git a/modules/parsers/MACO/Zloader.py b/modules/parsers/MACO/Zloader.py
index 0db17d77..326a518f 100644
--- a/modules/parsers/MACO/Zloader.py
+++ b/modules/parsers/MACO/Zloader.py
@@ -6,7 +6,7 @@
 
 
 def convert_to_MACO(raw_config: dict):
-    if not raw_config:
+    if not (raw_config and isinstance(raw_config, dict)):
         return None
 
     parsed_result = MACOModel(family="Zloader", other=raw_config)