diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java
index 7f95471d75..db5f3aafc2 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java
@@ -96,9 +96,9 @@ public class ChangeArgumentParser {
   }
 
   private List<ChangeControl> changeFromNotesFactory(String id,
-      final CurrentUser currentUser) throws OrmException {
+      final CurrentUser currentUser) throws OrmException, UnloggedFailure {
     List<ChangeNotes> changes =
-        changeNotesFactory.create(db, Arrays.asList(Change.Id.parse(id)));
+        changeNotesFactory.create(db, parseId(id));
     return FluentIterable.from(changes)
         .transform(new Function<ChangeNotes, ChangeControl>() {
           @Override
@@ -108,6 +108,14 @@ public class ChangeArgumentParser {
         }).filter(Predicates.notNull()).toList();
   }
 
+  private List<Change.Id> parseId(String id) throws UnloggedFailure {
+    try {
+      return Arrays.asList(new Change.Id(Integer.parseInt(id)));
+    } catch (NumberFormatException e) {
+      throw new UnloggedFailure(2, "Invalid change ID " + id, e);
+    }
+  }
+
   private ChangeControl controlForChange(ChangeNotes change, CurrentUser user) {
     try {
       return changeControlFactory.controlFor(change, user);