diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesView.java b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesView.java
index 4567031..25e66b8 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/GitilesView.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/GitilesView.java
@@ -192,13 +192,12 @@
       switch (type) {
         case DIFF:
         case LOG:
-          this.oldRevision = revision;
           break;
         default:
           checkState(revision == null, "cannot set old revision on %s view", type);
-          this.oldRevision = revision;
           break;
       }
+      this.oldRevision = revision;
       return this;
     }
 
@@ -218,18 +217,17 @@
       switch (type) {
         case PATH:
         case DIFF:
-          this.path = maybeTrimLeadingAndTrailingSlash(checkNotNull(path));
+          checkState(path != null, "cannot set null path on %s view", type);
           break;
         case DESCRIBE:
         case REFS:
         case LOG:
-          this.path = path != null ? maybeTrimLeadingAndTrailingSlash(path) : null;
           break;
         default:
           checkState(path == null, "cannot set path on %s view", type);
-          this.path = path;
           break;
       }
+      this.path = path != null ? maybeTrimLeadingAndTrailingSlash(path) : null;
       return this;
     }