diff --git a/pom.xml b/pom.xml
index 605867d714..b5d5248bbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,7 +253,7 @@ limitations under the License.
   </licenses>
 
   <properties>
-    <jgitVersion>0.5.0</jgitVersion>
+    <jgitVersion>0.5.0-57-g4c5eb17</jgitVersion>
     <gwtormVersion>1.1.1</gwtormVersion>
     <gwtjsonrpcVersion>1.1.0</gwtjsonrpcVersion>
     <gwtexpuiVersion>1.1.2</gwtexpuiVersion>
diff --git a/src/main/java/com/google/gerrit/git/PushQueue.java b/src/main/java/com/google/gerrit/git/PushQueue.java
index 16e76f1c5c..48f5f6c44e 100644
--- a/src/main/java/com/google/gerrit/git/PushQueue.java
+++ b/src/main/java/com/google/gerrit/git/PushQueue.java
@@ -23,6 +23,7 @@ import com.jcraft.jsch.Session;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.spearce.jgit.errors.ConfigInvalidException;
 import org.spearce.jgit.lib.RepositoryConfig;
 import org.spearce.jgit.transport.OpenSshConfig;
 import org.spearce.jgit.transport.RefSpec;
@@ -157,6 +158,9 @@ public class PushQueue {
       } catch (FileNotFoundException e) {
         log.warn("No " + cfgFile + "; not replicating");
         configs = Collections.emptyList();
+      } catch (ConfigInvalidException e) {
+        log.error("Can't read " + cfgFile, e);
+        return Collections.emptyList();
       } catch (IOException e) {
         log.error("Can't read " + cfgFile, e);
         return Collections.emptyList();
diff --git a/src/main/java/com/google/gerrit/server/GerritServer.java b/src/main/java/com/google/gerrit/server/GerritServer.java
index 19cd52ce44..d986dc244d 100644
--- a/src/main/java/com/google/gerrit/server/GerritServer.java
+++ b/src/main/java/com/google/gerrit/server/GerritServer.java
@@ -65,6 +65,7 @@ import org.apache.commons.net.smtp.SMTPClient;
 import org.apache.commons.net.smtp.SMTPReply;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.spearce.jgit.errors.ConfigInvalidException;
 import org.spearce.jgit.lib.PersonIdent;
 import org.spearce.jgit.lib.RepositoryConfig;
 import org.spearce.jgit.lib.WindowCache;
@@ -205,6 +206,8 @@ public class GerritServer {
       gerritConfigFile.load();
     } catch (FileNotFoundException e) {
       log.info("No " + cfgLoc.getAbsolutePath() + "; assuming defaults");
+    } catch (ConfigInvalidException e) {
+      throw new OrmException("Cannot read " + cfgLoc.getAbsolutePath(), e);
     } catch (IOException e) {
       throw new OrmException("Cannot read " + cfgLoc.getAbsolutePath(), e);
     }