4 files changed, 10 insertions, 8 deletions
diff --git a/lldb/source/Core/Address.cpp b/lldb/source/Core/Address.cpp
index 8f5e19f8c3a..a79becbf49c 100644
--- a/lldb/source/Core/Address.cpp
+++ b/lldb/source/Core/Address.cpp
@@ -433,7 +433,9 @@ Address::Dump (Stream *s, ExecutionContextScope *exe_scope, DumpStyle style, Dum
 
     case DumpStyleModuleWithFileAddress:
         if (section_sp)
-            s->Printf("%s[", section_sp->GetModule()->GetFileSpec().GetFilename().AsCString());
+        {
+            s->Printf("%s[", section_sp->GetModule()->GetFileSpec().GetFilename().AsCString("<Unknown>"));
+        }
         // Fall through
     case DumpStyleFileAddress:
         {
diff --git a/lldb/source/Core/AddressRange.cpp b/lldb/source/Core/AddressRange.cpp
index 3505d56b43e..ac64833884e 100644
--- a/lldb/source/Core/AddressRange.cpp
+++ b/lldb/source/Core/AddressRange.cpp
@@ -179,7 +179,7 @@ AddressRange::Dump(Stream *s, Target *target, Address::DumpStyle style, Address:
         {
             ModuleSP module_sp (GetBaseAddress().GetModule());
             if (module_sp)
-                s->Printf("%s", module_sp->GetFileSpec().GetFilename().AsCString());
+                s->Printf("%s", module_sp->GetFileSpec().GetFilename().AsCString("<Unknown>"));
         }
         s->AddressRange(vmaddr, vmaddr + GetByteSize(), addr_size);
         return true;
diff --git a/lldb/source/Core/AddressResolverFileLine.cpp b/lldb/source/Core/AddressResolverFileLine.cpp
index f7004c8bb08..6089abd76cb 100644
--- a/lldb/source/Core/AddressResolverFileLine.cpp
+++ b/lldb/source/Core/AddressResolverFileLine.cpp
@@ -96,7 +96,7 @@ AddressResolverFileLine::GetDepth()
 void
 AddressResolverFileLine::GetDescription (Stream *s)
 {
-    s->Printf ("File and line address - file: \"%s\" line: %u", m_file_spec.GetFilename().AsCString(), m_line_number);
+    s->Printf ("File and line address - file: \"%s\" line: %u", m_file_spec.GetFilename().AsCString("<Unknown>"), m_line_number);
 }
 
 
diff --git a/lldb/source/Core/SearchFilter.cpp b/lldb/source/Core/SearchFilter.cpp
index 8e3d8d0a91e..9c3412a422d 100644
--- a/lldb/source/Core/SearchFilter.cpp
+++ b/lldb/source/Core/SearchFilter.cpp
@@ -450,7 +450,7 @@ SearchFilterByModule::GetDescription (Stream *s)
     }
     else
     {
-        s->PutCString(m_module_spec.GetFilename().AsCString("<unknown>"));
+        s->PutCString(m_module_spec.GetFilename().AsCString("<Unknown>"));
     }
 }
 
@@ -612,7 +612,7 @@ SearchFilterByModuleList::GetDescription (Stream *s)
         }
         else
         {
-            s->PutCString(m_module_spec_list.GetFileSpecAtIndex(0).GetFilename().AsCString("<unknown>"));
+            s->PutCString(m_module_spec_list.GetFileSpecAtIndex(0).GetFilename().AsCString("<Unknown>"));
         }
     }
     else
@@ -628,7 +628,7 @@ SearchFilterByModuleList::GetDescription (Stream *s)
             }
             else
             {
-                s->PutCString(m_module_spec_list.GetFileSpecAtIndex(i).GetFilename().AsCString("<unknown>"));
+                s->PutCString(m_module_spec_list.GetFileSpecAtIndex(i).GetFilename().AsCString("<Unknown>"));
             }
             if (i != num_modules - 1)
                 s->PutCString (", ");
@@ -811,7 +811,7 @@ SearchFilterByModuleListAndCU::GetDescription (Stream *s)
         }
         else
         {
-            s->PutCString(m_module_spec_list.GetFileSpecAtIndex(0).GetFilename().AsCString("<unknown>"));
+            s->PutCString(m_module_spec_list.GetFileSpecAtIndex(0).GetFilename().AsCString("<Unknown>"));
         }
     }
     else if (num_modules > 0)
@@ -827,7 +827,7 @@ SearchFilterByModuleListAndCU::GetDescription (Stream *s)
             }
             else
             {
-                s->PutCString(m_module_spec_list.GetFileSpecAtIndex(i).GetFilename().AsCString("<unknown>"));
+                s->PutCString(m_module_spec_list.GetFileSpecAtIndex(i).GetFilename().AsCString("<Unknown>"));
             }
             if (i != num_modules - 1)
                 s->PutCString (", ");