From c44306f7f3e60b7c9a364bba7babd9fcb092cfd2 Mon Sep 17 00:00:00 2001
From: Filipe Cabecinhas <me@filcab.net>
Date: Tue, 28 Aug 2012 13:59:38 +0000
Subject: [PATCH] Fixes by Daniel Malea.

llvm-svn: 162756
---
 lldb/lib/Makefile                                             | 1 +
 .../Plugins/OperatingSystem/Python/OperatingSystemPython.cpp  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lldb/lib/Makefile b/lldb/lib/Makefile
index 78d934b1dcdd..02c5b95ecbb5 100644
--- a/lldb/lib/Makefile
+++ b/lldb/lib/Makefile
@@ -40,6 +40,7 @@ USEDLIBS = lldbAPI.a \
 	lldbPluginObjectContainerBSDArchive.a \
 	lldbPluginObjectFileELF.a \
 	lldbPluginObjectFilePECOFF.a \
+	lldbPluginOperatingSystemPython.a \
 	lldbPluginPlatformGDBServer.a \
 	lldbPluginProcessGDBRemote.a \
 	lldbPluginSymbolFileDWARF.a \
diff --git a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
index cf4cac5d5ac8..8de0f1058e2f 100644
--- a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
+++ b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
@@ -214,12 +214,12 @@ OperatingSystemPython::CreateRegisterContextForThread (Thread *thread)
 {
     RegisterContextSP reg_ctx_sp;
     if (!m_interpreter || !m_python_object || !thread)
-        return NULL;
+        return RegisterContextSP();
     auto object_sp = m_interpreter->OSPlugin_QueryForRegisterContextData (m_interpreter->MakeScriptObject(m_python_object),
                                                                           thread->GetID());
 
            if (!object_sp)
-        return NULL;
+        return RegisterContextSP();
     
     PythonDataString reg_context_data((PyObject*)object_sp->GetObject());
     if (reg_context_data)