diff --git a/atom/browser/api/atom_api_screen.cc b/atom/browser/api/atom_api_screen.cc index 6e5dd716d7f..c595f350d92 100644 --- a/atom/browser/api/atom_api_screen.cc +++ b/atom/browser/api/atom_api_screen.cc @@ -117,16 +117,14 @@ mate::ObjectTemplateBuilder Screen::GetObjectTemplateBuilder( // static v8::Handle Screen::Create(v8::Isolate* isolate) { if (!Browser::Get()->is_ready()) { - isolate->ThrowException(v8::Exception::Error(mate::StringToV8( - isolate, "Can not initialize \"screen\" module before app is ready"))); - return v8::Undefined(isolate); + node::ThrowError("Cannot initialize \"screen\" module before app is ready"); + return v8::Null(isolate); } gfx::Screen* screen = gfx::Screen::GetNativeScreen(); if (!screen) { - isolate->ThrowException(v8::Exception::Error(mate::StringToV8( - isolate, "Failed to get screen information"))); - return v8::Undefined(isolate); + node::ThrowError("Failed to get screen information"); + return v8::Null(isolate); } return mate::CreateHandle(isolate, new Screen(screen)).ToV8(); diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc index d8e18854c74..ce9f584f74a 100644 --- a/atom/browser/api/atom_api_window.cc +++ b/atom/browser/api/atom_api_window.cc @@ -142,13 +142,11 @@ void Window::OnRendererResponsive() { // static mate::Wrappable* Window::New(v8::Isolate* isolate, const mate::Dictionary& options) { - if (Browser::Get()->is_ready()) { - return new Window(options); - } else { - isolate->ThrowException(v8::Exception::TypeError(mate::StringToV8( - isolate, "Can not create BrowserWindow before app is ready"))); + if (!Browser::Get()->is_ready()) { + node::ThrowError("Cannot create BrowserWindow before app is ready"); return nullptr; } + return new Window(options); } void Window::Destroy() {