diff --git a/apisupport/apisupport.wizards/manifest.mf b/apisupport/apisupport.wizards/manifest.mf
index 94563f2ae530..87b2102809dc 100644
--- a/apisupport/apisupport.wizards/manifest.mf
+++ b/apisupport/apisupport.wizards/manifest.mf
@@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.netbeans.modules.apisupport.wizards
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/project/ui/wizard/common/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/apisupport/project/ui/wizard/common/layer.xml
-OpenIDE-Module-Specification-Version: 1.28
+OpenIDE-Module-Specification-Version: 1.28.1
 
diff --git a/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/DataModel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/DataModel.java
index 43e2a698bf5d..1489fae2d7d5 100644
--- a/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/DataModel.java
+++ b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/DataModel.java
@@ -621,7 +621,7 @@ void setEdContextSeparatorBefore(boolean separator) {
         this.edContextSeparatorBefore = separator;
     }
 
-    static class ActionReferenceModel implements Serializable {
+    public static class ActionReferenceModel implements Serializable {
         String parentPath;
         String name;
         int beforeSep;
@@ -630,7 +630,7 @@ static class ActionReferenceModel implements Serializable {
 
         public ActionReferenceModel(String parentPath, String name, int beforeSep, int afterSep, int position) {
             this.parentPath = parentPath;
-            this.name = name;
+            this.name = name != null ? name : "";
             this.beforeSep = beforeSep;
             this.afterSep = afterSep;
             this.position = position;
@@ -645,7 +645,7 @@ public int position() {
         }
 
         public String name() {
-            return name == null ? "" : name;
+            return name;
         }
 
         public int separatorBefore() {
@@ -658,7 +658,7 @@ public int separatorAfter() {
 
         @Override
         public String toString() {
-            return "ActionReferenceModel{" + "parentPath=" + parentPath + ", name=" + name + ", beforeSep=" + beforeSep + ", afterSep=" + afterSep + ", position=" + position + '}';
+            return "ActionReferenceModel{" + "path=" + parentPath + ", name=" + name + ", beforeSep=" + beforeSep + ", afterSep=" + afterSep + ", position=" + position + '}';
         }