From 6a6995d31c7c56c340d6f45a76976d43506cd6cc Mon Sep 17 00:00:00 2001
From: Luke Inman-Semerau <luke.semerau@gmail.com>
Date: Mon, 2 Jun 2014 08:01:22 -0700
Subject: [PATCH] errorHandler needs to be instantiated (there's more than one
 way to construct this beast and subclasses don't necessarily call super
 constructor).

Fixes Issue #7415
---
 .../client/src/org/openqa/selenium/remote/RemoteWebDriver.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java b/java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java
index 4183d3bc6e465..16fdbf4053d24 100644
--- a/java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java
+++ b/java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java
@@ -81,7 +81,7 @@ public class RemoteWebDriver implements WebDriver, JavascriptExecutor,
   private static final Logger logger = Logger.getLogger(RemoteWebDriver.class.getName());
   private Level level = Level.FINE;
 
-  private ErrorHandler errorHandler;
+  private ErrorHandler errorHandler = new ErrorHandler();
   private CommandExecutor executor;
   private Capabilities capabilities;
   private SessionId sessionId;
@@ -102,7 +102,6 @@ protected RemoteWebDriver() {
 
   public RemoteWebDriver(CommandExecutor executor, Capabilities desiredCapabilities,
       Capabilities requiredCapabilities) {
-    this.errorHandler = new ErrorHandler();
     this.executor = executor;
 
     init(desiredCapabilities, requiredCapabilities);