Index: source/Commands/CommandObjectThread.cpp
===================================================================
--- source/Commands/CommandObjectThread.cpp
+++ source/Commands/CommandObjectThread.cpp
@@ -466,6 +466,7 @@
                                              StepType step_type,
                                              StepScope step_scope) :
         CommandObjectParsed (interpreter, name, help, syntax,
+                             eFlagRequiresFrame         |
                              eFlagRequiresProcess       |
                              eFlagRequiresThread        |
                              eFlagTryTargetAPILock      |
@@ -579,9 +580,10 @@
         
         if (m_step_type == eStepTypeInto)
         {
+            // No need to check "frame" for validity as eFlagRequiresFrame guarantees that.
             StackFrame *frame = thread->GetStackFrameAtIndex(0).get();
 
-            if (frame && frame->HasDebugInformation ())
+            if (frame->HasDebugInformation ())
             {
                 new_plan_sp = thread->QueueThreadPlanForStepInRange (abort_other_plans,
                                                                 frame->GetSymbolContext(eSymbolContextEverything).line_entry.range,