diff --git a/ReleaseNotes/ReleaseNotes-2.6.txt b/ReleaseNotes/ReleaseNotes-2.6.txt
index ff114c6..e1b7e16 100644
--- a/ReleaseNotes/ReleaseNotes-2.6.txt
+++ b/ReleaseNotes/ReleaseNotes-2.6.txt
@@ -117,7 +117,7 @@
   plugin which is included as a core plugin in the Gerrit distribution and
   can be installed during site initialization.
 
-EMail
+Email
 ~~~~~
 * link:https://code.google.com/p/gerrit/issues/detail?id=1531[Issue 1531]:
 Email footers now include `Gerrit-HasComments: {Yes|No}`.
@@ -185,7 +185,7 @@
 
 * `ls-groups` prints "N/A" if the group's name is not set.
 
-EMail
+Email
 ~~~~~
 * Missing email templates are added to the site initialization.
 * Merge failure emails are only sent once per day.
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
index c38ad49..14508a4 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
@@ -263,11 +263,11 @@
 
   private final ProjectControl projectControl;
   private final Project project;
+  private final LabelTypes labelTypes;
   private final Repository repo;
   private final ReceivePack rp;
   private final NoteMap rejectCommits;
   private MagicBranchInput magicBranch;
-  private LabelTypes labelTypes;
 
   private List<CreateRequest> newChanges = Collections.emptyList();
   private final Map<Change.Id, ReplaceRequest> replaceByChange =
@@ -346,6 +346,7 @@
     this.receiveConfig = config;
 
     this.projectControl = projectControl;
+    this.labelTypes = projectControl.getLabelTypes();
     this.project = projectControl.getProject();
     this.repo = repo;
     this.rp = new ReceivePack(repo);
@@ -1124,7 +1125,6 @@
       reject(cmd, "cannot upload review");
       return;
     }
-    labelTypes = projectControl.getLabelTypes();
 
     // Validate that the new commits are connected with the target
     // branch.  If they aren't, we want to abort. We do this check by