2 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
index 87354577fb..276176a691 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
@@ -628,7 +628,7 @@ void ClassItem::updateMembers(const Style *style)
             }
             *currentVisibility = member.visibility();
         }
-        if (member.group() != currentGroup) {
+        if (currentGroup && member.group() != *currentGroup) {
             if (addSpace)
                 *text += QStringLiteral(" ");
             *text += QString(QStringLiteral("[%1]")).arg(member.group());
diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp
index 3b2de69ec7..85813004de 100644
--- a/src/libs/utils/stringutils.cpp
+++ b/src/libs/utils/stringutils.cpp
@@ -183,7 +183,7 @@ bool AbstractMacroExpander::expandNestedMacros(const QString &str, int *pos, QSt
             if (!expandNestedMacros(str, &i, ret))
                 return false;
             varName.chop(1);
-            varName += ret;
+            varName += *ret;
         } else if (currArg == &varName && c == '-' && prev == ':' && validateVarName(varName)) {
             varName.chop(1);
             currArg = &defaultValue;