diff --git a/include/pybind11/cast.h b/include/pybind11/cast.h
index ecbf3843..22f7ffbf 100644
--- a/include/pybind11/cast.h
+++ b/include/pybind11/cast.h
@@ -154,8 +154,9 @@ public:
         }
         auto it = internals.registered_types.find(type_info);
         if (it == internals.registered_types.end()) {
-            std::string msg = std::string("Unregistered type : ") + type_info->name();
-            detail::clean_type_id(msg);
+            std::string tname = type_info->name();
+            detail::clean_type_id(tname);
+            std::string msg = "Unregistered type : " + tname;
             PyErr_SetString(PyExc_TypeError, msg.c_str());
             return nullptr;
         }