diff --git a/cmake/std/atdm/utils/get_known_system_info.sh b/cmake/std/atdm/utils/get_known_system_info.sh
index 75208321b443..5a1f50cba3f5 100644
--- a/cmake/std/atdm/utils/get_known_system_info.sh
+++ b/cmake/std/atdm/utils/get_known_system_info.sh
@@ -114,8 +114,10 @@ fi
 
 #echo "hostnameMatch ='${hostnameMatch}'"
 
-systemNameTypeMatchedList+=(${hostnameMatchSystemName})
-systemNameTypeMatchedListHostNames[${hostnameMatchSystemName}]=${hostnameMatch}
+if [[ "${hostnameMatch}" != "" ]] ; then
+  systemNameTypeMatchedList+=(${hostnameMatchSystemName})
+  systemNameTypeMatchedListHostNames[${hostnameMatchSystemName}]=${hostnameMatch}
+fi
 
 #
 # C) Look for known system types that matches this machine