diff --git a/monkey/monkey_island/cc/resources/aws_exporter.py b/monkey/monkey_island/cc/resources/aws_exporter.py
index ab9c74185..a3ee0309a 100644
--- a/monkey/monkey_island/cc/resources/aws_exporter.py
+++ b/monkey/monkey_island/cc/resources/aws_exporter.py
@@ -103,7 +103,6 @@ class AWSExporter(Exporter):
                                        region_name=region)
 
             import_response = securityhub.batch_import_findings(Findings=findings_list)
-            print import_response
             if import_response['ResponseMetadata']['HTTPStatusCode'] == 200:
                 return True
             else:
diff --git a/monkey/monkey_island/cc/resources/telemetry.py b/monkey/monkey_island/cc/resources/telemetry.py
index c5d9ef8a6..581cbf3dc 100644
--- a/monkey/monkey_island/cc/resources/telemetry.py
+++ b/monkey/monkey_island/cc/resources/telemetry.py
@@ -192,8 +192,9 @@ class Telemetry(flask_restful.Resource):
             wmi_handler = WMIHandler(monkey_id, telemetry_json['data']['wmi'], users_secrets)
             wmi_handler.process_and_handle_wmi_info()
         if 'aws' in telemetry_json['data']:
-            mongo.db.monkey.update_one({'_id': monkey_id},
-                                       {'aws_instance_id': telemetry_json['data']['aws']['instance-id']})
+            if 'instance-id' in telemetry_json['data']['aws']:
+                mongo.db.monkey.update_one({'_id': monkey_id},
+                                           {'aws_instance_id': telemetry_json['data']['aws']['instance-id']})
 
     @staticmethod
     def add_ip_to_ssh_keys(ip, ssh_info):