diff --git a/gen_fru_properties.pl b/gen_fru_properties.pl
index 43cc753..c371658 100755
--- a/gen_fru_properties.pl
+++ b/gen_fru_properties.pl
@@ -13,12 +13,14 @@
 my $mrwFile = "";
 my $outFile = "";
 my $configFile = "";
+my $skipBrokenMrw = 0;
 
 
 GetOptions(
 "m=s" => \$mrwFile,
 "c=s" => \$configFile,
 "o=s" => \$outFile,
+"skip-broken-mrw" => \$skipBrokenMrw
 )
 or printUsage();
 
@@ -79,6 +81,10 @@
     my ($yamlDict) = @_;
     for my $type (keys %targetHash)
     {
+        if($skipBrokenMrw and !exists $defaultPaths{$type})
+        {
+            next;
+        }
         print $fh $defaultPaths{$type}.":";
         print $fh "\n";
         while (my ($interface,$propertyMap) = each %{$yamlDict->{$type}})
@@ -140,6 +146,9 @@
 sub printUsage
 {
     print "
-    $0 -m [MRW file] -c [Config yaml] -o [Output filename]\n";
+    $0 -m [MRW file] -c [Config yaml] -o [Output filename] [OPTIONS]
+Options:
+    --skip-broken-mrw = Skip broken MRW targets
+    \n";
     exit(1);
 }