diff --git a/src/x86_64/Gget_proc_info.c b/src/x86_64/Gget_proc_info.c
index a380f19a..5130f5a7 100644
--- a/src/x86_64/Gget_proc_info.c
+++ b/src/x86_64/Gget_proc_info.c
@@ -31,6 +31,11 @@ PROTECTED int
 unw_get_proc_info (unw_cursor_t *cursor, unw_proc_info_t *pi)
 {
   struct cursor *c = (struct cursor *) cursor;
+  int ret;
 
-  return dwarf_make_proc_info (&c->dwarf);
+  if (ret = dwarf_make_proc_info (&c->dwarf))
+    return ret;
+
+  *pi = c->dwarf.pi;
+  return 0;
 }