diff --git a/projects/amdsmi/amdsmi_cli/amdsmi_logger.py b/projects/amdsmi/amdsmi_cli/amdsmi_logger.py
index 356aa71fa1..4957bcff31 100644
--- a/projects/amdsmi/amdsmi_cli/amdsmi_logger.py
+++ b/projects/amdsmi/amdsmi_cli/amdsmi_logger.py
@@ -1011,8 +1011,8 @@ class AMDSMILogger():
 
         # print the version information first
         amd_smi_version = str(output['version_info']['amd-smi'])
-        if len(amd_smi_version) > 20:
-            amd_smi_version = amd_smi_version[:17] + "..."
+        if len(amd_smi_version) > 60:
+            amd_smi_version = amd_smi_version[:57] + "..."
         rocm_version = "N/A"
         if output['version_info']['rocm version'][0]:
             rocm_version = str(output['version_info']['rocm version'][1]).ljust(8)
@@ -1026,29 +1026,30 @@ class AMDSMILogger():
                 # Extract version using regex to find pattern like "6.8.0-60"
                 match = re.search(r'(\d+\.\d+\.\d+-\d+)', driver_version['driver_version'])
                 if match:
-                    amdgpu_version = match.group(1).ljust(8)
+                    amdgpu_version = match.group(1)[:80]
                 else:
-                    amdgpu_version = "N/A".ljust(8)
+                    amdgpu_version = "N/A"
             else:
-                amdgpu_version = str(driver_version['driver_version'])[:8].ljust(8)
+                amdgpu_version = str(driver_version['driver_version'])[:80]
         fw_pldm_version = str(output['version_info']['fw pldm version'])
         vbios_version = str(output['version_info']['vbios version'])
 
         # print GPU info
         print(default_line_1)
-        print("| AMD-SMI {0:20s} amdgpu version: {1:8s} ROCm version: {2:8s} |".format(amd_smi_version.ljust(20), amdgpu_version, rocm_version))
+        # Split the version line into 3 lines, each wrapping to the same width
+        print("| AMD-SMI          {0:40s} {1:19s}|".format(amd_smi_version.ljust(40), ""))
+        if amdgpu_version != "N/A":
+            print("| amdgpu Version:  {0:40s} {1:19s}|".format(amdgpu_version, ""))
+        if rocm_version != "N/A":
+            print("| ROCm Version:    {0:40s} {1:19s}|".format(rocm_version, ""))
 
-        # adjust format depending on whether vbios or fw pldm version is present
-        if vbios_version != "N/A" and fw_pldm_version != "N/A":
-            print("| VBIOS version: {0:22s}  {1:12s}  FW PLDM: {2:15s}|".format(vbios_version, "", fw_pldm_version))
-        elif vbios_version != "N/A" and fw_pldm_version == "N/A":
-            print("| VBIOS version: {0:22s}  {1:37s} |".format(vbios_version, ""))
-        elif fw_pldm_version != "N/A" and vbios_version == "N/A":
-            print("| FW PLDM: {0:15s}  {1:50s} |".format(fw_pldm_version, ""))
-        else:
-            pass  # Both VBIOS and FW PLDM versions are "N/A" so skip this line
+        # only print if the version is not "N/A"
+        if vbios_version != "N/A":
+            print("| VBIOS Version:   {0:22s}  {1:35s} |".format(vbios_version, ""))
+        if fw_pldm_version != "N/A":
+            print("| FW PLDM:         {0:15s}  {1:42s} |".format(fw_pldm_version, ""))
 
-        print("| Platform: {0:25.25s} {1:41s}|".format(str(self.helpers.os_info()), ""))
+        print("| Platform:        {0:25.25s} {1:34s}|".format(str(self.helpers.os_info()), ""))
         print(default_line_2)
         print("| BDF                        GPU-Name | Mem-Uti   Temp   UEC       Power-Usage |")
         print("| GPU  HIP-ID  OAM-ID  Partition-Mode | GFX-Uti    Fan               Mem-Usage |")
diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc
index 2004c16793..4082462d28 100644
--- a/projects/amdsmi/src/amd_smi/amd_smi.cc
+++ b/projects/amdsmi/src/amd_smi/amd_smi.cc
@@ -4612,6 +4612,9 @@ amdsmi_status_t amdsmi_get_gpu_driver_info(amdsmi_processor_handle processor_han
     // Get the driver version
     status = smi_amdgpu_get_driver_version(gpu_device,
                 &length, info->driver_version);
+    if (status != AMDSMI_STATUS_SUCCESS) {
+        return status;
+    }
 
     SMIGPUDEVICE_MUTEX(gpu_device->get_mutex())
     std::string render_name = gpu_device->get_gpu_path();
diff --git a/projects/amdsmi/src/amd_smi/amd_smi_utils.cc b/projects/amdsmi/src/amd_smi/amd_smi_utils.cc
index 8941c5f68e..3625665caf 100644
--- a/projects/amdsmi/src/amd_smi/amd_smi_utils.cc
+++ b/projects/amdsmi/src/amd_smi/amd_smi_utils.cc
@@ -616,12 +616,9 @@ amdsmi_status_t smi_amdgpu_get_driver_version(amd::smi::AMDSmiGPUDevice* device,
     std::strncpy(version, empty.c_str(), len-1);
     openFileAndModifyBuffer("/sys/module/amdgpu/version",
                                       version, static_cast<size_t>(len));
-    if (version[0] == '\0') {
-        openFileAndModifyBuffer("/proc/version", version, static_cast<size_t>(len));
-        if (version[0] == '\0') {
-            return AMDSMI_STATUS_IO;
-        }
-    }
+    if (version[0] == '\0')
+        return AMDSMI_STATUS_DIRECTORY_NOT_FOUND;
+
     return status;
 }