diff --git a/monkey/monkey_island/cc/resources/aws_exporter.py b/monkey/monkey_island/cc/resources/aws_exporter.py
index e7221a668..44dd94859 100644
--- a/monkey/monkey_island/cc/resources/aws_exporter.py
+++ b/monkey/monkey_island/cc/resources/aws_exporter.py
@@ -26,7 +26,8 @@ class AWSExporter(Exporter):
             return True
         for machine in issues_list:
             for issue in issues_list[machine]:
-                findings_list.append(AWSExporter._prepare_finding(issue))
+                if not issue.get('aws_instance_id', None):
+                    findings_list.append(AWSExporter._prepare_finding(issue))
 
         if not AWSExporter._send_findings(findings_list, AWSExporter._get_aws_keys()):
             logger.error('Exporting findings to aws failed')
diff --git a/monkey/monkey_island/cc/services/report.py b/monkey/monkey_island/cc/services/report.py
index 2a60ffa12..b89266cad 100644
--- a/monkey/monkey_island/cc/services/report.py
+++ b/monkey/monkey_island/cc/services/report.py
@@ -553,7 +553,7 @@ class ReportService:
 
     @staticmethod
     def get_machine_aws_instance_id(hostname):
-        return str(list(mongo.db.monkey.find({'hostname': hostname}, {'aws_instance_id': 1}))[0]['aws_instance_id'])
+        return str(list(mongo.db.monkey.find({'hostname': hostname}, {'aws_instance_id': 1}))[0].get('aws_instance_id', None))
 
     @staticmethod
     def get_issues():
diff --git a/monkey/monkey_island/deb-package/monkey_island_pip_requirements.txt b/monkey/monkey_island/deb-package/monkey_island_pip_requirements.txt
index 446414ecf..7046bf231 100644
--- a/monkey/monkey_island/deb-package/monkey_island_pip_requirements.txt
+++ b/monkey/monkey_island/deb-package/monkey_island_pip_requirements.txt
@@ -14,4 +14,5 @@ netifaces
 ipaddress
 enum34
 PyCrypto
+boto3
 virtualenv
\ No newline at end of file