diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html
index 282949b2774a707fcd04450eda5e69c85bcadc04..dea9d8031ab3579f936af6c1d28bb61ea039f7ab 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html
@@ -213,7 +213,6 @@
 	<script type="text/javascript" src="./js/views/DataSetForm/DataSetFormView.js"></script>
 	
 	<script type="text/javascript" src="./js/views/DataSetForm/widgets/AdvancedEntitySearchDropdown.js"></script>
-	<script type="text/javascript" src="./js/views/DataSetForm/widgets/AdvancedEntitySearchDropdown2.js"></script>
 	<script type="text/javascript" src="./js/views/DataSetForm/widgets/DatasetViewerController.js"></script>
 	<script type="text/javascript" src="./js/views/DataSetForm/widgets/DatasetViewerModel.js"></script>
 	<script type="text/javascript" src="./js/views/DataSetForm/widgets/DatasetViewerView.js"></script>
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
index d18df1777e5365036a21a5571193006b84ebd2ba..b19d1a6c40d58c5b01892bd80b24a6732870ad7a 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
@@ -51,8 +51,8 @@ function ServerFacade(openbisServer) {
 	var responseInterceptor = function(response, action){
 		var isError = false;
 		if(response && response.error) {
-			if(response.error.message === "Session no longer available. Please login again."
-					|| response.error.message.endsWith("is invalid: user is not logged in.")) {
+			if(response.error.message && (response.error.message === "Session no longer available. Please login again."
+					|| response.error.message.endsWith("is invalid: user is not logged in."))) {
 				isError = true;
 				Util.showError(response.error.message, function() {
 					location.reload(true);
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/AdvancedEntitySearchDropdown2.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/AdvancedEntitySearchDropdown2.js
deleted file mode 100644
index e4581ba0b44a9988caf2b6b490e47ad1476e7b93..0000000000000000000000000000000000000000
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/AdvancedEntitySearchDropdown2.js
+++ /dev/null
@@ -1,76 +0,0 @@
-function AdvancedEntitySearchDropdown2(placeholder) {
-	var placeholder = placeholder;
-	this.isMultiple = true;
-	this.isRequired = false;
-	var onChangeCallback = null;
-	
-	this.onChange = function(onChangeCallbackGiven) {
-		onChangeCallback = onChangeCallbackGiven
-	}
-
-	this.search = function(query, callback) {
-		callback([]);
-	}
-	
-	this.renderResult = function(result) {
-		return [];
-	}
-	
-	var $select = FormUtil.getPlainDropdown({}, "");
-	
-	this.init = function($container) {
-		var _this = this;
-		$select.attr("multiple", "multiple");
-		if (this.isRequired) {
-			$select.attr("required", "required");
-		}
-		if (this.isMultiple) {
-			maximumSelectionLength = 9999;
-		} else {
-			maximumSelectionLength = 1;
-		}
-		$container.append($select);
-
-		$select.select2({
-			width: '100%', 
-			theme: "bootstrap",
-			maximumSelectionLength: maximumSelectionLength,
-			minimumInputLength: 2,
-			placeholder : placeholder,
-			ajax: {
-				delay: 1000,
-				processResults: function (data) {
-					return {
-						"results": _this.renderResult(data),
-						"pagination": {
-							"more": false
-						}
-					};
-				},
-				transport: function (params, success, failure) {
-					var query = params.data.q;
-					_this.search(query, success);
-					return {
-						abort : function() { /*Not implemented*/ }
-					}
-				}
-			}
-		});
-
-		if (onChangeCallback) {
-			var onSelectOrUnselect = function (e) {
-				onChangeCallback($select.select2('data'));
-			};
-			$select.on('select2:select', onSelectOrUnselect);
-			$select.on('select2:unselect', onSelectOrUnselect);
-		}
-	}
-
-	this.getData = function() {
-		return $select.select2('data');
-	}
-	
-	this.clear = function() {
-		$select.val(null).trigger('change');
-	}
-}
\ No newline at end of file