diff --git a/src/kits/debugger/controllers/ThreadHandler.cpp b/src/kits/debugger/controllers/ThreadHandler.cpp
index a25bdc5830..33d6b7b931 100644
--- a/src/kits/debugger/controllers/ThreadHandler.cpp
+++ b/src/kits/debugger/controllers/ThreadHandler.cpp
@@ -826,6 +826,9 @@ ThreadHandler::_HandleSingleStepStep(CpuState* cpuState)
 			if (stackTrace != NULL) {
 				StackFrame* frame = stackTrace->FrameAt(0);
 				Image* image = frame->GetImage();
+				if (image == NULL)
+					return false;
+
 				ImageDebugInfo* info = NULL;
 				if (GetImageDebugInfo(image, info) != B_OK)
 					return false;