Index: /branches/amp_3_7_2/scripts/export_es_snapshot.sh
===================================================================
--- /branches/amp_3_7_2/scripts/export_es_snapshot.sh	(revision 2851)
+++ /branches/amp_3_7_2/scripts/export_es_snapshot.sh	(working copy)
@@ -182,7 +182,7 @@
     log "Transferring snapshot to ${REMOTE_USER}@${REMOTE_IP}:${REMOTE_PATH}"
 
     RSYNC_OUTPUT=$(sshpass -p "$REMOTE_PASS" rsync -av \
-        -e "ssh -o StrictHostKeyChecking=no" \
+        -e "ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 -o ServerAliveCountMax=5" \
         "$SNAPSHOT_DIR/" "$REMOTE_USER@$REMOTE_IP:${REMOTE_PATH}/" 2>&1)
     
     RSYNC_RET=$?
\ No newline at end of file
Index: /branches/amp_3_7_2/scripts/import_es_snapshot.sh
===================================================================
--- /branches/amp_3_7_2/scripts/import_es_snapshot.sh	(revision 2862)
+++ /branches/amp_3_7_2/scripts/import_es_snapshot.sh	(working copy)
@@ -72,7 +72,7 @@
 log "[1/9] Detecting snapshot name on source AMP..."
 
 # Using -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa to fix "incorrect signature" issues
-SSH_OPTS="-o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa"
+SSH_OPTS="-o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa -o ServerAliveInterval=60 -o ServerAliveCountMax=5"
 
 INDEX_FILE=$(sshpass -p "$AMP_PASS" ssh $SSH_OPTS \
   "$AMP_USER@$AMP_IP" "ls -1 $DIR/index-* 2>/dev/null | head -1"
\ No newline at end of file
Index: /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/hive/controller/snapshot_controller.py
===================================================================
--- /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/hive/controller/snapshot_controller.py	(revision 2867)
+++ /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/hive/controller/snapshot_controller.py	(working copy)
@@ -177,7 +177,7 @@
 # ============================================================
 def get_import_status():
     if not os.path.exists(LOG_FILE_IMPORT):
-        return json_response({"status": "unknown", "message": "Import log not found"}, 200)
+        return json_response({"status": "Not Started", "message": "Import log not found"}, 200)
 
     try:
         result = get_status_for_import()
@@ -190,6 +190,14 @@
 
 
 def get_status_for_import():
+    # --------------------------------------------------
+    # Log file not created yet → export not started
+    # --------------------------------------------------
+    if not os.path.exists(LOG_FILE_IMPORT):
+        return {
+            "status": "Not Started",
+            "message": "Import has not been initiated"
+        }
     with open(LOG_FILE_IMPORT) as f:
         lines = f.readlines()
     # Find last import start marker
@@ -229,7 +237,7 @@
 
 def get_export_status():
     if not os.path.exists(LOG_FILE_EXPORT):
-        return json_response({"status": "unknown", "message": "Export log not found"}, 200)
+        return json_response({"status": "Not Started", "message": "Export log not found"}, 200)
 
     try:
         result = get_status_for_export()
@@ -242,6 +250,14 @@
 
 
 def get_status_for_export():
+    # --------------------------------------------------
+    # Log file not created yet → export not started
+    # --------------------------------------------------
+    if not os.path.exists(LOG_FILE_EXPORT):
+        return {
+            "status": "Not Started",
+            "message": "Export has not been initiated"
+        }
     with open(LOG_FILE_EXPORT, "r") as f:
         lines = f.readlines()
     # Find last import start marker