diff --git a/monkey/common/network/segmentation_utils.py b/monkey/common/network/segmentation_utils.py
index aeff7f135..9bbaabf1d 100644
--- a/monkey/common/network/segmentation_utils.py
+++ b/monkey/common/network/segmentation_utils.py
@@ -15,7 +15,7 @@ def get_ip_if_in_subnet(ip_addresses, subnet):
     """
     :param ip_addresses: IP address list.
     :param subnet: Subnet to check if one of ip_addresses is in there. This is common.network.network_range.NetworkRange
-    :return: The first IP in ip_addresses which is in the subnet.
+    :return: The first IP in ip_addresses which is in the subnet if there is one, otherwise returns None.
     """
     for ip_address in ip_addresses:
         if subnet.is_in_range(ip_address):
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
index 5da053242..2ce25bf20 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
@@ -2,8 +2,8 @@ import React, {Component} from "react";
 import {Modal} from "react-bootstrap";
 import EventsTimeline from "./EventsTimeline";
 import * as PropTypes from "prop-types";
-import FileSaver from "file-saver";
 import ExportEventsButton from "./ExportEventsButton";
+import saveJsonToFile from "../../utils/SaveJsonToFile";
 
 export default class EventsModal extends Component {
   constructor(props) {
@@ -27,9 +27,9 @@ export default class EventsModal extends Component {
                 Close
               </button>
               <ExportEventsButton onClick={() => {
-                const content = JSON.stringify(this.props.events, null, 2);
-                const blob = new Blob([content], {type: "text/plain;charset=utf-8"});
-                FileSaver.saveAs(blob, this.props.exportFilename + ".json");
+                const dataToSave = this.props.events;
+                const filename = this.props.exportFilename;
+                saveJsonToFile(dataToSave, filename);
               }}/>
             </div>
           </Modal.Body>
diff --git a/monkey/monkey_island/cc/ui/src/components/utils/SaveJsonToFile.js b/monkey/monkey_island/cc/ui/src/components/utils/SaveJsonToFile.js
new file mode 100644
index 000000000..6ad124457
--- /dev/null
+++ b/monkey/monkey_island/cc/ui/src/components/utils/SaveJsonToFile.js
@@ -0,0 +1,7 @@
+import FileSaver from "file-saver";
+
+export default function saveJsonToFile(dataToSave, filename) {
+  const content = JSON.stringify(dataToSave, null, 2);
+  const blob = new Blob([content], {type: "text/plain;charset=utf-8"});
+  FileSaver.saveAs(blob, filename + ".json");
+}