diff --git a/infection_monkey/system_info/windows_info_collector.py b/infection_monkey/system_info/windows_info_collector.py
index d6c852801..f6d85355c 100644
--- a/infection_monkey/system_info/windows_info_collector.py
+++ b/infection_monkey/system_info/windows_info_collector.py
@@ -139,16 +139,18 @@ class WindowsInfoCollector(InfoCollector):
         self.get_hostname()
         self.get_process_list()
         self.get_network_info()
-        #self.get_azure_info()
+        self.get_azure_info()
         
-        #self.get_wmi_info()
+        self.get_wmi_info()
+        LOG.debug('finished get_wmi_info')
         #self.get_reg_key(r"SYSTEM\CurrentControlSet\Control\Lsa")
         self.get_installed_packages()
         
         mimikatz_collector = MimikatzCollector()
         mimikatz_info = mimikatz_collector.get_logon_info()
         if mimikatz_info:
-            self.info["credentials"].update(mimikatz_info)
+            if "credentials" in self.info:
+                self.info["credentials"].update(mimikatz_info)
             self.info["mimikatz"] = mimikatz_collector.get_mimikatz_text()
 
         return self.info