diff --git a/tools/build/cfgdef/src/main/java/org/onosproject/cfgdef/CfgDefGenerator.java b/tools/build/cfgdef/src/main/java/org/onosproject/cfgdef/CfgDefGenerator.java
index 9488261..c46b583 100644
--- a/tools/build/cfgdef/src/main/java/org/onosproject/cfgdef/CfgDefGenerator.java
+++ b/tools/build/cfgdef/src/main/java/org/onosproject/cfgdef/CfgDefGenerator.java
@@ -131,8 +131,10 @@
             String def = pex[1];
             String desc = description(javaClass, name);
 
-            String line = name + SEP + type + SEP + def + SEP + desc + "\n";
-            lines.add(line);
+            if (desc != null) {
+                String line = name + SEP + type + SEP + def + SEP + desc + "\n";
+                lines.add(line);
+            }
         }
     }
 
@@ -145,7 +147,7 @@
             String comment = field.getComment();
             return comment != null ? comment : NO_DESCRIPTION;
         }
-        return NO_DESCRIPTION;
+        return null;
     }
 
     private String elaborate(AnnotationValue value) {