diff --git a/dump/tools/common/include/opfunctions b/dump/tools/common/include/opfunctions
index 6469652..bd38532 100644
--- a/dump/tools/common/include/opfunctions
+++ b/dump/tools/common/include/opfunctions
@@ -12,8 +12,11 @@
             /xyz/openbmc_project/inventory/system xyz.openbmc_project.Inventory.Decorator.Asset \
         SerialNumber | cut -d " " -f 2 | sed "s/^\(\"\)\(.*\)\1\$/\2/g")
 
-    if [ -z "$serialNo" ]; then
+    if [ [ -z "$serialNo" || ! $serialNo =~ ^[A-Za-z0-9]+$ ] ]; then
         serialNo="0000000"
+    else
+        # Pad to 7 characters with leading zeros
+        serialNo=$(printf "%07s" "$serialNo" | tr ' ' '0')
     fi
 }