diff --git a/lib/std/debug.zig b/lib/std/debug.zig
index 421c6f863e5cd77caeff2762c3861c327b08178a..6083939bde16d3515480ab3d632e1ac6ca1f414a 100644
--- a/lib/std/debug.zig
+++ b/lib/std/debug.zig
@@ -868,7 +868,7 @@ fn printUnknownSource(debug_info: *DebugInfo, out_stream: anytype, address: usiz
 pub fn printUnwindError(debug_info: *DebugInfo, out_stream: anytype, address: usize, err: UnwindError, tty_config: io.tty.Config) !void {
     const module_name = debug_info.getModuleNameForAddress(address) orelse "???";
     try tty_config.setColor(out_stream, .dim);
-    try out_stream.print("Unwind information for `{s}` was not available ({}), trace may be incomplete\n\n", .{ module_name, err });
+    try out_stream.print("Unwind information for `{s}:{}` was not available ({}), trace may be incomplete\n\n", .{ module_name, address, err });
     try tty_config.setColor(out_stream, .reset);
 }
 
diff --git a/lib/std/dwarf.zig b/lib/std/dwarf.zig
index 67ea342cbfebe0376944a4adb95fe76ddfa4cf85..393973741374f19231ae816c8e375f7a89399c18 100644
--- a/lib/std/dwarf.zig
+++ b/lib/std/dwarf.zig
@@ -1758,7 +1758,7 @@ pub const DwarfInfo = struct {
         }
 
         if (has_next_ip) {
-            context.pc = mem.readIntSliceNative(usize, try abi.regBytes(context.thread_context, comptime abi.ipRegNum(), context.reg_context));
+            context.pc = mem.readIntSliceNative(usize, try abi.regBytes(context.thread_context, cie.return_address_register, context.reg_context));
         } else {
             context.pc = 0;
         }