diff --git a/frontend-js/src/main/js/gui/admin/EditGenomeDialog.js b/frontend-js/src/main/js/gui/admin/EditGenomeDialog.js
index ea3450fc00e922c91a830d0458112dcdba8b590b..0eecb1c31e7614a7b5ab39da54405e3d71e951da 100644
--- a/frontend-js/src/main/js/gui/admin/EditGenomeDialog.js
+++ b/frontend-js/src/main/js/gui/admin/EditGenomeDialog.js
@@ -363,18 +363,8 @@ EditGenomeDialog.prototype.init = function () {
     genomeLocalUrlInput.val(genome.getLocalUrl());
     genomeLocalUrlInput.prop("disabled", true);
 
-    var progress;
-    if (genome.getDownloadProgress() === 100) {
-      if (genome.getLocalUrl() !== undefined) {
-        progress = "READY";
-      } else {
-        progress = "ERROR";
-      }
-    } else {
-      progress = genome.getDownloadProgress();
-    }
     var genomeProgressInput = $("[name=genomeProgress]", self.getElement());
-    genomeProgressInput.val(progress);
+    genomeProgressInput.val(genome.getDownloadProgressStatus());
     genomeProgressInput.prop("disabled", true);
 
   });
diff --git a/frontend-js/src/main/js/gui/admin/GenomeAdminPanel.js b/frontend-js/src/main/js/gui/admin/GenomeAdminPanel.js
index d3b754b0d6541a76faca31bed19141568b92b7e1..fc79970c50ed136f672ff0eb3c16c0f4c99176b6 100644
--- a/frontend-js/src/main/js/gui/admin/GenomeAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/GenomeAdminPanel.js
@@ -164,15 +164,7 @@ GenomeAdminPanel.prototype.genomeToTableRow = function (genome, user) {
   row[0] = genome.getType();
   row[1] = self.getGuiUtils().createAnnotationLink(genome.getOrganism()).outerHTML;
   row[2] = genome.getVersion();
-  if (genome.getDownloadProgress() === 100) {
-    if (genome.getLocalUrl() !== undefined) {
-      row[3] = "READY";
-    } else {
-      row[3] = "ERROR";
-    }
-  } else {
-    row[3] = genome.getDownloadProgress();
-  }
+  row[3] = genome.getDownloadProgressStatus();
   row[4] = genome.getSourceUrl();
 
   var disabled = " disabled ";
diff --git a/frontend-js/src/main/js/map/data/ReferenceGenome.js b/frontend-js/src/main/js/map/data/ReferenceGenome.js
index f484559a1b21e8d9d44f66908ad473ec5dbca4a6..032563ceb170dd935747b2cec8ef0b4bf5e3bbc2 100644
--- a/frontend-js/src/main/js/map/data/ReferenceGenome.js
+++ b/frontend-js/src/main/js/map/data/ReferenceGenome.js
@@ -75,6 +75,27 @@ ReferenceGenome.prototype.setDownloadProgress = function (downloadProgress) {
 };
 
 
+/**
+ *
+ * @returns {string}
+ */
+ReferenceGenome.prototype.getDownloadProgressStatus = function () {
+  if (this.getDownloadProgress() === 100) {
+    if (this.getLocalUrl() !== undefined) {
+      return "READY";
+    } else {
+      return "ERROR";
+    }
+  } else {
+    if (this.getDownloadProgress() === undefined) {
+      return "N/A";
+    } else {
+      return this.getDownloadProgress().toString();
+    }
+  }
+};
+
+
 /**
  *
  * @param {Annotation} organism