diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 6f100e5..a6e1d74 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "2.0.69";
+  public static final String LABEL = "2.0.70";
 
   private Version() {
   }
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java b/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
index e1f01ff..d157111 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
@@ -1078,9 +1078,13 @@
             } else {
               // The switch map refers to a field on the enum that does not exist in this
               // compilation.
-              return;
+              targetMap = null;
+              break;
             }
           }
+          if (targetMap == null) {
+            continue;
+          }
           int[] keys = targetMap.keySet().toIntArray();
           Arrays.sort(keys);
           int[] targets = new int[keys.length];