Index: source/Target/StackFrameList.cpp
===================================================================
--- source/Target/StackFrameList.cpp	(revision 136694)
+++ source/Target/StackFrameList.cpp	(working copy)
@@ -63,7 +63,7 @@
         if (m_show_inlined_frames)
         {
 #if defined (DEBUG_STACK_FRAMES)
-            StreamFile s(stdout);
+            StreamFile s(stdout, false);
 #endif
             Unwind *unwinder = m_thread.GetUnwinder ();
             addr_t pc = LLDB_INVALID_ADDRESS;
@@ -456,7 +456,7 @@
     Mutex::Locker prev_locker (prev_sp.get() ? prev_sp->m_mutex.GetMutex() : NULL);
 
 #if defined (DEBUG_STACK_FRAMES)
-    StreamFile s(stdout);
+    StreamFile s(stdout, false);
     s.PutCString("\n\nStackFrameList::Merge():\nPrev:\n");
     if (prev_sp.get())
         prev_sp->Dump (&s);
@@ -517,7 +517,9 @@
     //const uint32_t num_prev_frames = prev_sp->GetNumFrames (false);
 
 #if defined (DEBUG_STACK_FRAMES)
-    s.Printf("\n%u previous frames with one current frame\n", num_prev_frames);
+    if (prev_sp.get() != NULL) {
+        s.Printf("\n%u previous frames with one current frame\n", prev_sp.get()->GetNumFrames());
+    }
 #endif
 
     // We have only a single current frame