diff --git a/browser/atom_browser_main_parts.cc b/browser/atom_browser_main_parts.cc
index 2ee9c08e4e62..aaec24bea750 100644
--- a/browser/atom_browser_main_parts.cc
+++ b/browser/atom_browser_main_parts.cc
@@ -75,6 +75,11 @@ void AtomBrowserMainParts::PreMainMessageLoopRun() {
 
   node_bindings_->RunMessageLoop();
 
+  // Make sure the url request job factory is created before the
+  // will-finish-launching event.
+  static_cast<content::BrowserContext*>(AtomBrowserContext::Get())->
+      GetRequestContext();
+
 #if !defined(OS_MACOSX)
   // The corresponding call in OS X is in AtomApplicationDelegate.
   Browser::Get()->WillFinishLaunching();
diff --git a/spec/main.js b/spec/main.js
index 0d021157151e..f2e52627946a 100644
--- a/spec/main.js
+++ b/spec/main.js
@@ -35,6 +35,9 @@ app.on('window-all-closed', function() {
 });
 
 app.on('finish-launching', function() {
+  // Test if using protocol module would crash.
+  require('protocol').registerProtocol('test-if-crashes', function() {});
+
   window = new BrowserWindow({
     title: 'atom-shell tests',
     show: false,