Index: source/Breakpoint/Watchpoint.cpp
===================================================================
--- source/Breakpoint/Watchpoint.cpp
+++ source/Breakpoint/Watchpoint.cpp
@@ -218,14 +218,21 @@
         s->Printf("\nWatchpoint %u hit:", GetID());
         prefix = "";
     }
-    
+
     if (m_old_value_sp)
     {
-        s->Printf("\n%sold value: %s", prefix, m_old_value_sp->GetValueAsCString());
+        if (m_old_value_sp->GetValueAsCString())
+            s->Printf("\n%sold value: %s", prefix, m_old_value_sp->GetValueAsCString());
+        else
+            s->Printf("\n%sold value: %s", prefix, m_old_value_sp->GetSummaryAsCString());
     }
+
     if (m_new_value_sp)
     {
-        s->Printf("\n%snew value: %s", prefix, m_new_value_sp->GetValueAsCString());
+        if (m_new_value_sp->GetValueAsCString())
+            s->Printf("\n%snew value: %s", prefix, m_new_value_sp->GetValueAsCString());
+        else
+            s->Printf("\n%snew value: %s", prefix, m_new_value_sp->GetSummaryAsCString());
     }
 }