diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index 6bb03927168e..e98e552cd96b 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -779,7 +779,7 @@ ValueObject::GetObjectRuntimeLanguage ()
     {
         if (ClangASTContext::IsObjCClassType (opaque_qual_type))
             return lldb::eLanguageTypeObjC;
-        if (ClangASTContext::IsCXXClassType (opaque_qual_type));
+        if (ClangASTContext::IsCXXClassType (opaque_qual_type))
             return lldb::eLanguageTypeC_plus_plus;
     }
             
diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp
index 287ae7687352..cf223b4cfb0c 100644
--- a/lldb/source/Symbol/ClangASTContext.cpp
+++ b/lldb/source/Symbol/ClangASTContext.cpp
@@ -817,7 +817,7 @@ ClangASTContext::AddMethodToCXXRecordType
 )
 {
     if (!record_opaque_type || !method_opaque_type || !name)
-        return false;
+        return NULL;
     
     assert(ast_context);