diff --git a/Core/Debugger.cpp b/Core/Debugger.cpp
index a774b045..03be8943 100644
--- a/Core/Debugger.cpp
+++ b/Core/Debugger.cpp
@@ -783,33 +783,36 @@ bool Debugger::ProcessRamOperation(MemoryOperationType type, uint16_t &addr, uin
 		_prevInstructionCycle = _curInstructionCycle;
 		_curInstructionCycle = (int64_t)_cpu->GetCycleCount();
 
-		_disassembler->BuildCache(addressInfo, addr, false, true);
-		
 		if(absoluteAddr >= 0) {
 			_codeDataLogger->SetFlag(absoluteAddr, CdlPrgFlags::Code);
 		}
 
-		if(_disassembler->IsJump(value)) {
-			uint16_t targetPc = _disassembler->GetDisassemblyInfo(addressInfo).GetJumpDestination(_cpu->GetPC(), _memoryManager.get());
-			AddressTypeInfo addressInfo;
-			GetAbsoluteAddressAndType(targetPc, &addressInfo);
-			if(addressInfo.Address >= 0 && addressInfo.Type == AddressType::PrgRom) {
-				if(value == 0x20) {
-					//JSR, mark target as a sub entry point
-					_disassembler->BuildCache(addressInfo, targetPc, true, false);
-					_functionEntryPoints.emplace(addressInfo.Address);
-					_codeDataLogger->SetFlag(addressInfo.Address, CdlPrgFlags::SubEntryPoint);
-				} else {
-					//Only mark as jump target if not marked as sub entry point
-					_codeDataLogger->SetFlag(addressInfo.Address, CdlPrgFlags::JumpTarget);
+		if(addressInfo.Address >= 0) {
+			_disassembler->BuildCache(addressInfo, addr, false, true);
+
+			if(_disassembler->IsJump(value)) {
+				uint16_t targetPc = _disassembler->GetDisassemblyInfo(addressInfo).GetJumpDestination(_cpu->GetPC(), _memoryManager.get());
+
+				AddressTypeInfo targetAddr;
+				GetAbsoluteAddressAndType(targetPc, &targetAddr);
+				if(targetAddr.Address >= 0 && targetAddr.Type == AddressType::PrgRom) {
+					if(value == 0x20) {
+						//JSR, mark target as a sub entry point
+						_disassembler->BuildCache(targetAddr, targetPc, true, false);
+						_functionEntryPoints.emplace(targetAddr.Address);
+						_codeDataLogger->SetFlag(targetAddr.Address, CdlPrgFlags::SubEntryPoint);
+					} else {
+						//Only mark as jump target if not marked as sub entry point
+						_codeDataLogger->SetFlag(targetAddr.Address, CdlPrgFlags::JumpTarget);
+					}
 				}
 			}
+
+			_performanceTracker->ProcessCpuExec(addressInfo);
 		}
 
 		ProcessStepConditions(addr);
 
-		_performanceTracker->ProcessCpuExec(addressInfo);
-
 		BreakSource breakSource = BreakSource::Unspecified;
 		if(value == 0 && CheckFlag(DebuggerFlags::BreakOnBrk)) {
 			Step(1);
@@ -845,7 +848,11 @@ bool Debugger::ProcessRamOperation(MemoryOperationType type, uint16_t &addr, uin
 		if(_codeRunner && _codeRunner->IsRunning() && addr >= 0x3000 && addr < 0x4000) {
 			disassemblyInfo = _codeRunner->GetDisassemblyInfo(addr);
 		} else {
-			disassemblyInfo = _disassembler->GetDisassemblyInfo(addressInfo);
+			if(addressInfo.Address >= 0) {
+				disassemblyInfo = _disassembler->GetDisassemblyInfo(addressInfo);
+			} else {
+				disassemblyInfo.Initialize(addr, _memoryManager.get(), false);
+			}
 		}
 		_traceLogger->Log(_debugState, disassemblyInfo, operationInfo);
 	} else {
diff --git a/Core/DisassemblyInfo.cpp b/Core/DisassemblyInfo.cpp
index c9342988..459e8118 100644
--- a/Core/DisassemblyInfo.cpp
+++ b/Core/DisassemblyInfo.cpp
@@ -163,6 +163,21 @@ void DisassemblyInfo::Initialize(uint8_t* opPointer, bool isSubEntryPoint)
 	_isSubExitPoint = opCode == 0x40 || opCode == 0x60;
 }
 
+void DisassemblyInfo::Initialize(uint16_t addr, MemoryManager* memoryManager, bool isSubEntryPoint)
+{
+	_isSubEntryPoint = isSubEntryPoint;
+	
+	uint8_t opCode = memoryManager->DebugRead(addr);
+	_opSize = DisassemblyInfo::OPSize[opCode];
+	_opMode = DisassemblyInfo::OPMode[opCode];
+
+	for(uint32_t i = 0; i < _opSize; i++) {
+		_byteCode[i] = memoryManager->DebugRead(addr + i);
+	}
+
+	_isSubExitPoint = opCode == 0x40 || opCode == 0x60;
+}
+
 void DisassemblyInfo::SetSubEntryPoint()
 {
 	_isSubEntryPoint = true;
diff --git a/Core/DisassemblyInfo.h b/Core/DisassemblyInfo.h
index b8102766..6d39218e 100644
--- a/Core/DisassemblyInfo.h
+++ b/Core/DisassemblyInfo.h
@@ -1,11 +1,10 @@
 #pragma once
 #include "stdafx.h"
 #include <unordered_map>
+#include "Types.h"
 
 class MemoryManager;
 class LabelManager;
-struct State;
-enum class AddrMode;
 
 class DisassemblyInfo
 {
@@ -16,17 +15,18 @@ public:
 	static bool IsUnofficialCode[256];
 
 private:
-	uint8_t _byteCode[3];
+	uint8_t _byteCode[3] = {};
 	bool _isSubEntryPoint = false;
 	bool _isSubExitPoint = false;
 	uint32_t _opSize = 0;
-	AddrMode _opMode;
+	AddrMode _opMode = AddrMode::None;
 	
 public:
 	DisassemblyInfo();
 	DisassemblyInfo(uint8_t* opPointer, bool isSubEntryPoint);
 
 	void Initialize(uint8_t * opPointer, bool isSubEntryPoint);
+	void Initialize(uint16_t addr, MemoryManager* memoryManager, bool isSubEntryPoint);
 
 	void SetSubEntryPoint();