diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 85b0b4ec..4a1a8e2d 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -85,6 +85,15 @@ class Server_Add_Controller extends Controller {
       }
     }
 
+    if ($total_count == 0) {
+      print json_encode(array("result" => "success",
+                              "url" => "",
+                              "task" => array(
+                                "id" => -1, "done" => 1, "percent_complete" => 100,
+                                "status" => t("No Eligible files, import cancelled"))));
+      return;
+    }
+    
     $task_def = Task_Definition::factory()
       ->callback("server_add_task::add_from_server")
       ->description(t("Add photos or movies from the local server"))
diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
index c7f06e0e..b98b7a86 100644
--- a/modules/server_add/js/server_add.js
+++ b/modules/server_add/js/server_add.js
@@ -108,9 +108,21 @@ function do_add(submit, event) {
     data: parms,
     dataType: "json",
     success: function(data, textStatus) {
+      var done = data.task.done;
+      if (done) {
+        task = null;
+        $("body").append("<div id='gNoFilesDialog'>" + data.task.status + "</div>");
+
+        $("#gNoFilesDialog").dialog({modal: true,
+                                    autoOpen: true,
+                                    title: FILE_IMPORT_WARNING});
+        $(".gProgressBar").css("visibility", "hidden");
+        $("#gServerAdd #gServerAddButton").show();
+        $("#gServerAdd #gServerPauseButton").hide();
+        return;
+      }
       task = data.task;
       var url = data.url;
-      var done = false;
       while (!done && !paused) {
         $.ajax({async: false,
           success: function(data, textStatus) {
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index dc41c2b5..c8eb6a1c 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -1,6 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script>
   var FATAL_ERROR = "<?= t("Fatal Error") ?>";
+  var FILE_IMPORT_WARNING = "<?= t("Add from server warning") ?>";
 </script>
 <?= html::script("modules/server_add/js/server_add.js"); ?>
 <div id="gServerAdd">