3 files changed, 17 insertions, 4 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
index 723a13164..bf16b85ac 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
@@ -1862,10 +1862,7 @@ QDebug operator<<(QDebug d, const AbstractMetaField *af)
 
 static void formatMetaEnumValue(QDebug &d, const AbstractMetaEnumValue *v)
 {
-    const QString &name = v->stringValue();
-    if (!name.isEmpty())
-        d << name << '=';
-    d << v->value();
+    d << v->name() << '=' << v->value();
 }
 
 QDebug operator<<(QDebug d, const AbstractMetaEnumValue *v)
diff --git a/sources/shiboken2/ApiExtractor/messages.cpp b/sources/shiboken2/ApiExtractor/messages.cpp
index 95dcda558..cbcf0986b 100644
--- a/sources/shiboken2/ApiExtractor/messages.cpp
+++ b/sources/shiboken2/ApiExtractor/messages.cpp
@@ -678,3 +678,16 @@ QString msgFallbackWarning(const QXmlStreamReader &reader, const QString &contex
         message += QLatin1String(" [") + identifier + QLatin1Char(']');
     return msgTagWarning(reader, context, tag, message);
 }
+
+QString msgArgumentClassNotFound(const AbstractMetaFunction *func,
+                                 const TypeEntry *t)
+{
+    QString result;
+    QTextStream str(&result);
+    str << "Internal Error: Class \"" <<  t->qualifiedCppName()
+        << "\" for \"";
+    if (auto *ic = func->implementingClass())
+        str << ic->qualifiedCppName() << "::";
+    str << func->signature() << "\" not found!";
+    return result;
+}
diff --git a/sources/shiboken2/ApiExtractor/messages.h b/sources/shiboken2/ApiExtractor/messages.h
index 3f1a8650b..b20ee6f91 100644
--- a/sources/shiboken2/ApiExtractor/messages.h
+++ b/sources/shiboken2/ApiExtractor/messages.h
@@ -203,4 +203,7 @@ QString msgFallbackWarning(const QXmlStreamReader &reader, const QString &contex
                            const QString &tag, const QString &location,
                            const QString &identifier, const QString &fallback);
 
+QString msgArgumentClassNotFound(const AbstractMetaFunction *func,
+                                 const TypeEntry *t);
+
 #endif // MESSAGES_H