diff --git a/src/apps/debugger/gui/team_window/VariablesView.cpp b/src/apps/debugger/gui/team_window/VariablesView.cpp
index 7a1dc00654..e011945797 100644
--- a/src/apps/debugger/gui/team_window/VariablesView.cpp
+++ b/src/apps/debugger/gui/team_window/VariablesView.cpp
@@ -907,8 +907,10 @@ VariablesView::_RequestVariableValue(Variable* variable)
 void
 VariablesView::_SaveViewState() const
 {
-	if (fThread == NULL || fStackFrame == NULL)
+	if (fThread == NULL || fStackFrame == NULL
+		|| fStackFrame->Function() == NULL) {
 		return;
+	}
 
 	// get the function ID
 	FunctionID* functionID = fStackFrame->Function()->GetFunctionID();
@@ -946,8 +948,10 @@ VariablesView::_RestoreViewState()
 		fPreviousViewState = NULL;
 	}
 
-	if (fThread == NULL || fStackFrame == NULL)
+	if (fThread == NULL || fStackFrame == NULL
+		|| fStackFrame->Function() == NULL) {
 		return;
+	}
 
 	// get the function ID
 	FunctionID* functionID = fStackFrame->Function()->GetFunctionID();