diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_130.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_130.java
index 52f90b5b4d..afb62faf3a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_130.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_130.java
@@ -25,10 +25,8 @@ import com.google.gerrit.server.git.MetaDataUpdate;
 import com.google.gwtorm.server.OrmException;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-import java.io.IOException;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import org.eclipse.jgit.errors.ConfigInvalidException;
 import org.eclipse.jgit.lib.PersonIdent;
 import org.eclipse.jgit.lib.Repository;
 
@@ -66,7 +64,7 @@ public class Schema_130 extends SchemaVersion {
           repoUpgraded.add(projectName);
         }
         cfg.save(serverUser, COMMIT_MSG);
-      } catch (ConfigInvalidException | IOException ex) {
+      } catch (Exception ex) {
         throw new OrmException("Cannot migrate project " + projectName, ex);
       }
     }
diff --git a/tools/bzl/pkg_war.bzl b/tools/bzl/pkg_war.bzl
index c92b5c86f3..72ed9f878f 100644
--- a/tools/bzl/pkg_war.bzl
+++ b/tools/bzl/pkg_war.bzl
@@ -77,8 +77,8 @@ def _war_impl(ctx):
     # Add lib
     transitive_libs = []
     for j in ctx.attr.libs:
-        if hasattr(j, "JavaInfo"):
-            transitive_libs.append(j[JavaInfo].transitive_runtime_deps)
+        if hasattr(j, "java"):
+            transitive_libs.append(j.java.transitive_runtime_deps)
         elif hasattr(j, "files"):
             transitive_libs.append(j.files)
 
@@ -90,7 +90,7 @@ def _war_impl(ctx):
     # Add pgm lib
     transitive_pgmlibs = []
     for j in ctx.attr.pgmlibs:
-        transitive_pgmlibs.append(j[JavaInfo].transitive_runtime_deps)
+        transitive_pgmlibs.append(j.java.transitive_runtime_deps)
 
     transitive_pgmlib_deps = depset(transitive = transitive_pgmlibs)
     for dep in transitive_pgmlib_deps.to_list():