diff --git a/Makefile b/Makefile
index ff8d4913f..174180907 100644
--- a/Makefile
+++ b/Makefile
@@ -419,7 +419,7 @@ scst-dist-gzip:
 	  else								\
 	    scripts/list-source-files;					\
 	  fi | \
-	  grep -E '^doc/|^fcst/|^iscsi-scst/|^Makefile|^qla2x00t(|_git)/|^scst.spec|^scst/|^scst_local/|^srpt/|^usr/'|\
+	  grep -E '^doc/|^fcst/|^iscsi-scst/|^Makefile|^qla2x00t(|_git)/|^scst.spec|^scst/|^scst_local/|^srpt/|^usr/|^scstadmin/'|\
 	  tar -T- -cf- |						\
 	  tar -C $${name}-$(VERSION) -xf-;				\
 	} &&								\
diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin
index ab17335a5..48c4fa90d 100755
--- a/scstadmin/scstadmin.sysfs/scstadmin
+++ b/scstadmin/scstadmin.sysfs/scstadmin
@@ -5762,8 +5762,6 @@ sub configToAttr {
 		if (!scalar keys %{$$config{$attr}}) {
 				$attributes{$attr} = '';
 		} elsif ((keys %{$$config{$attr}}) > 1) {
-			immediateExit("Invalid configuration encountered. ".
-				      "Attribute '$attr' has multiple values.");
 			foreach my $value (keys %{$$config{$attr}}) {
 				push @{$attributes{$attr}}, $value;
 			}