diff --git a/lldb/include/lldb/API/SBWatchpoint.h b/lldb/include/lldb/API/SBWatchpoint.h
index 9d8d455ca376..d4f8d21a220b 100644
--- a/lldb/include/lldb/API/SBWatchpoint.h
+++ b/lldb/include/lldb/API/SBWatchpoint.h
@@ -32,6 +32,9 @@ public:
     bool
     IsValid() const;
 
+    SBError
+    GetError();
+
     watch_id_t
     GetID ();
 
diff --git a/lldb/source/API/SBWatchpoint.cpp b/lldb/source/API/SBWatchpoint.cpp
index 76ce57cccf75..594584c03918 100644
--- a/lldb/source/API/SBWatchpoint.cpp
+++ b/lldb/source/API/SBWatchpoint.cpp
@@ -90,6 +90,18 @@ SBWatchpoint::IsValid() const
     return m_opaque_sp;
 }
 
+SBError
+SBWatchpoint::GetError ()
+{
+    SBError sb_error;
+    lldb::WatchpointSP watchpoint_sp(GetSP());
+    if (watchpoint_sp)
+    {
+        sb_error.SetError(watchpoint_sp->GetError());
+    }
+    return sb_error;
+}
+
 int32_t
 SBWatchpoint::GetHardwareIndex ()
 {