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 4d80193..ccf7c2d 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
@@ -613,10 +613,10 @@
       if (replace.inputCommand == newChange) {
         replaceCount++;
 
-        if (replace.cmd.getResult() == OK) {
+        if (replace.cmd != null && replace.cmd.getResult() == OK) {
           okToInsert++;
         }
-      } else if (replace.cmd.getResult() == OK) {
+      } else if (replace.cmd != null && replace.cmd.getResult() == OK) {
         try {
           if (replace.insertPatchSet().checkedGet() != null) {
             replace.inputCommand.setResult(OK);
@@ -1318,6 +1318,9 @@
       final List<FooterLine> footerLines = commit.getFooterLines();
       for (final FooterLine footerLine : footerLines) {
         try {
+          if (ps.isDraft()) {
+            continue;
+          }
           if (isReviewer(footerLine)) {
             reviewers.add(toAccountId(footerLine.getValue().trim()));
           } else if (footerLine.matches(FooterKey.CC)) {