diff --git a/bin/mac/libnst64.dylib b/bin/mac/libnst64.dylib
index 399d8ee9a104..24716823755a 100755
Binary files a/bin/mac/libnst64.dylib and b/bin/mac/libnst64.dylib differ
diff --git a/native/MacTouchBar/src/TouchBar.m b/native/MacTouchBar/src/TouchBar.m
index dc03cb2316f8..a0a6e92a7db8 100644
--- a/native/MacTouchBar/src/TouchBar.m
+++ b/native/MacTouchBar/src/TouchBar.m
@@ -30,7 +30,7 @@
 
     NSTouchBarItem * result = (*_jcreator)([identifier UTF8String]);
     if (result == nil)
-        nserror(@"tb [%@]: can't make item for uid '%@'", identifier);
+        nserror(@"tb [%@]: can't make item for uid '%@'", self.name, identifier);
     return result;
 }
 
diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/NST.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/NST.java
index 629126ba5bd0..cc8d10e88b5f 100644
--- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/NST.java
+++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/NST.java
@@ -156,8 +156,8 @@ public class NST {
     return scrubberNativePeer;
   }
 
-  public static ID createGroupItem(String uid, ID[] items, int count) {
-    return ourNSTLibrary.createGroupItem(uid, items, count); // called from AppKit, uses per-event autorelease-pool
+  public static ID createGroupItem(String uid, ID[] items) {
+    return ourNSTLibrary.createGroupItem(uid, items == null || items.length == 0 ? null : items, items.length); // called from AppKit, uses per-event autorelease-pool
   }
 
   public static void updateButton(ID buttonObj,
diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBItemGroup.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBItemGroup.java
index f443c6ff23e3..492d828f7862 100644
--- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBItemGroup.java
+++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBItemGroup.java
@@ -26,7 +26,7 @@ class TBItemGroup extends TBItem {
       return ID.NIL;
 
     final ID[] ids = myGroupItems.getVisibleNativePeers();
-    return NST.createGroupItem(myUid, ids, ids.length);
+    return NST.createGroupItem(myUid, ids);
   }
 
   @Override