diff --git a/contrib/elfparser/demangle.cpp b/contrib/elfparser/demangle.cpp
index 1f941cd2..1b2852dd 100644
--- a/contrib/elfparser/demangle.cpp
+++ b/contrib/elfparser/demangle.cpp
@@ -21,13 +21,16 @@
 
 #include "demangle.h"
 
-gchar *
-sysprof_cplus_demangle (const gchar *name)
+char *
+sysprof_cplus_demangle (const char *name)
 {
   char *real_name;
-  gchar *ret;
+  char *ret;
   int status;
 
+  if (name == NULL)
+    return NULL;
+
   real_name = abi::__cxa_demangle (name, 0, 0, &status);
 
   if (real_name == NULL)