diff --git a/cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationResolverResult.java b/cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationResolverResult.java
index 38a88d09abf..ba2206a35f6 100644
--- a/cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationResolverResult.java
+++ b/cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationResolverResult.java
@@ -105,7 +105,7 @@ static class Builder {
         ImmutableMap.of();
     ImmutableMap<CToolchainIdeInfo, BlazeCompilerSettings> compilerSettings = ImmutableMap.of();
     ImmutableSet<File> validHeaderRoots = ImmutableSet.of();
-    Optional<XcodeCompilerSettings> xcodeSettings;
+    Optional<XcodeCompilerSettings> xcodeSettings = Optional.empty();
     private ImmutableMap<String, String> setTargetToVersionMap;
 
     public Builder() {}