diff --git a/src/object.cc b/src/object.cc
index f43bec9..bf32913 100644
--- a/src/object.cc
+++ b/src/object.cc
@@ -447,7 +447,13 @@
     return DexFile::kDexNoIndex;   // Special no mapping case
   }
   size_t mapping_table_length = GetMappingTableLength();
-  const void* code_offset = Runtime::Current()->IsMethodTracingActive() ? Runtime::Current()->GetTracer()->GetSavedCodeFromMap(this) : GetCode();
+  const void* code_offset;
+  if (Runtime::Current()->IsMethodTracingActive() &&
+      Runtime::Current()->GetTracer()->GetSavedCodeFromMap(this) != NULL) {
+    code_offset = Runtime::Current()->GetTracer()->GetSavedCodeFromMap(this);
+  } else {
+    code_offset = GetCode();
+  }
   uint32_t sought_offset = pc - reinterpret_cast<uintptr_t>(code_offset);
   uint32_t best_offset = 0;
   uint32_t best_dex_offset = 0;