diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
index a9255b3bdc2fca895571d6507c38be854ca2236f..0932bfb71b30a5882c2057e1feaa57229f47c419 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
@@ -759,12 +759,16 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod
 					var x = "123";
 					var listFilesForDataSetCallback = 
 						function(dataFiles) {
-							var elementId = 'preview-image';
-							var downloadUrl = _this.profile.allDataStores[0].downloadUrl + '/' + data.result[0].code + "/" + dataFiles.result[1].pathInDataSet + "?sessionID=" + _this.serverFacade.getSession();
-							
-							var img = $("#" + elementId);
-							img.attr('src', downloadUrl);
-							img.attr('data-preview-loaded', 'true');
+							if(!dataFiles.result) {
+								//DSS Is not running probably
+							} else {
+								var elementId = 'preview-image';
+								var downloadUrl = _this.profile.allDataStores[0].downloadUrl + '/' + data.result[0].code + "/" + dataFiles.result[1].pathInDataSet + "?sessionID=" + _this.serverFacade.getSession();
+								
+								var img = $("#" + elementId);
+								img.attr('src', downloadUrl);
+								img.attr('data-preview-loaded', 'true');
+							}
 						};
 					_this.serverFacade.listFilesForDataSet(data.result[0].code, "/", true, listFilesForDataSetCallback);
 				}
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/DataSetViewer.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/DataSetViewer.js
index 6ae465a38c608aa9f627583db46a35e5a892b866..20d9afc83b77d28ddfaf09fcb3bd20dded2e2428 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/DataSetViewer.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/DataSetViewer.js
@@ -179,11 +179,21 @@ function DataSetViewer(containerId, profile, sample, serverFacade, datastoreDown
 	}
 	
 	this.repaintImages = function() {
-		_this = this;
-		
 		var $container = $("#"+this.containerIdContent);
 		$container.empty();
+		
+		//
+		// No data store URL
+		//
+		if(datastoreDownloadURL === null) {
+			$container.append($("<p>")
+					.append($("<i>", { class: "icon-ban-circle" }))
+					.append(" Please configure properly your DSS server properly, looks like is not reachable."));
+			return;
+		}
+		
 		//
+		_this = this;
 		var maxImages = 30;
 		var numImages = 0;
 		for(var datasetCode in this.sampleDataSets) {
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js
index 2c535414f8665637e7982ea4ce4922970b2ab3a3..00fa290f0fcccbae15513217fd775d649dd397e4 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js
@@ -87,10 +87,9 @@ function SampleLinksWidget(containerId, profile, serverFacade, title, sampleType
 				return;
 			}
 			var xmlDoc = new DOMParser().parseFromString(stateField.val() , 'text/xml');
-			var root = xmlDoc.children[0];
-			var samples = root.children;
+			var samples = xmlDoc.getElementsByTagName("Sample");
 			for(var i = 0; i < samples.length; i++) {
-				var sample = samples[0];
+				var sample = samples[i];
 				var permId = sample.attributes["permId"].value;
 				for(var j = 0; j < sample.attributes.length; j++) {
 					var attribute = sample.attributes[j];