diff --git a/brightray/browser/browser_main_parts.cc b/brightray/browser/browser_main_parts.cc
index 642734aa4db9..9313a9fa92bb 100644
--- a/brightray/browser/browser_main_parts.cc
+++ b/brightray/browser/browser_main_parts.cc
@@ -105,7 +105,7 @@ void OverrideLinuxAppDataPath() {
 }
 
 int BrowserX11ErrorHandler(Display* d, XErrorEvent* error) {
-  if (!g_in_x11_io_error_handler) {
+  if (!g_in_x11_io_error_handler && base::ThreadTaskRunnerHandle::IsSet()) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(&ui::LogErrorEventDescription, d, *error));
   }
diff --git a/common.gypi b/common.gypi
index 7623eba2184f..df932c1e3949 100644
--- a/common.gypi
+++ b/common.gypi
@@ -184,7 +184,6 @@
           }, {
             'libraries': [
               '<@(libchromiumcontent_v8_libraries)',
-              '<(libchromiumcontent_dir)/libc++.so',
             ],
           }],
         ],