diff --git a/src_main/core/pistring.cpp b/src_main/core/pistring.cpp
index aafc6fd4..b33a3a70 100755
--- a/src_main/core/pistring.cpp
+++ b/src_main/core/pistring.cpp
@@ -376,11 +376,11 @@ void PIString::buildData(const char * cp) const {
 
 void PIString::trimsubstr(int &st, int &fn) const {
 	for (int i = 0; i < length(); ++i)
-		if (at(i) != ' ' && at(i) != '\t' && at(i) != '\n' && at(i) != '\r' && at(i) != char(12))
+		if (at(i) != ' ' && at(i) != '\t' && at(i) != '\n' && at(i) != '\r' && at(i) != char(12) && at(i) != uchar(0))
 			{st = i; break;}
 	if (st < 0) return;
 	for (int i = length() - 1; i >= 0; --i)
-		if (at(i) != ' ' && at(i) != '\t' && at(i) != '\n' && at(i) != '\r' && at(i) != char(12))
+		if (at(i) != ' ' && at(i) != '\t' && at(i) != '\n' && at(i) != '\r' && at(i) != char(12) && at(i) != uchar(0))
 			{fn = i; break;}
 }
 
diff --git a/src_main/io_devices/piserial.cpp b/src_main/io_devices/piserial.cpp
index 33d58073..cab28cec 100755
--- a/src_main/io_devices/piserial.cpp
+++ b/src_main/io_devices/piserial.cpp
@@ -793,7 +793,7 @@ PIStringList PISerial::availableDevices(bool test) {
 			DWORD name_len = 1024, data_len = 1024, type = 0;
 			ret = RegEnumValue(key, index, (LPTSTR)name, &name_len, NULL, &type, (uchar * )data, &data_len);
 			if (ret == ERROR_NO_MORE_ITEMS) break;
-			dl << PIString(data, data_len);
+			dl << PIString(data, data_len).trim();
 			index++;
 		}
 		RegCloseKey(key);