diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 3e7171c35..2d208bd5a 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -2040,6 +2040,7 @@ sub do_firmware_update {
             $exit_with_error_func->($sessdata->{node}, $callback,
                 "At least one update file (.bin or .pnor) needs to be in data directory $pUpdate_directory.");
         }
+
         # All checks are done, run pUpdate utility on each of the update files found in 
         # the specified data directory
         xCAT::SvrUtils::sendmsg("rflash started, Please wait...", $callback, $sessdata->{node});
@@ -2107,11 +2108,16 @@ sub do_firmware_update {
         $exit_with_success_func->($sessdata->{node}, $callback, "Firmware updated, powering chassis on to populate FRU information...");
     }
 
+    # If we get here, the target machine is *NOT* IBM Power S822LC for Big Data (Supermicro)
+    # Only .hpm files is supported for such machine, no directory option is supported
+    if (defined $directory_name) {
+        $exit_with_error_func->($sessdata->{node}, $callback, "Directory option is not supported for target machine: \n$output");
+    }
     if (($hpm_data_hash{deviceID} ne $sessdata->{device_id}) ||
         ($hpm_data_hash{productID} ne $sessdata->{prod_id}) ||
         ($hpm_data_hash{manufactureID} ne $sessdata->{mfg_id})) {
         $exit_with_error_func->($sessdata->{node}, $callback,
-            "The image file doesn't match this machine");
+            "The image file doesn't match target machine: \n$output");
     }
 
     # check for 8335-GTB Firmware above 1610A release.  If below, exit