diff --git a/java/src/org/openqa/selenium/firefox/FirefoxOptions.java b/java/src/org/openqa/selenium/firefox/FirefoxOptions.java index 4737d8cab7e99..f5a714bb15f9e 100644 --- a/java/src/org/openqa/selenium/firefox/FirefoxOptions.java +++ b/java/src/org/openqa/selenium/firefox/FirefoxOptions.java @@ -305,7 +305,8 @@ public FirefoxOptions merge(Capabilities capabilities) { List arguments = (List) (capabilities.getCapability(("args"))); arguments.forEach( arg -> { - if (!((List) newInstance.firefoxOptions.get(Keys.ARGS.key())).contains(arg)) { + List existingArgs = (List) newInstance.firefoxOptions.get(Keys.ARGS.key()); + if (existingArgs == null || !existingArgs.contains(arg)) { newInstance.addArguments(arg); } }); @@ -367,7 +368,8 @@ public FirefoxOptions merge(Capabilities capabilities) { arguments.forEach( arg -> { - if (!((List) newInstance.firefoxOptions.get(Keys.ARGS.key())).contains(arg)) { + List existingArgs = (List) newInstance.firefoxOptions.get(Keys.ARGS.key()); + if (existingArgs == null || !existingArgs.contains(arg)) { newInstance.addArguments(arg); } });