diff --git a/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java b/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java
index dcfb61413e..be975c5e99 100644
--- a/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java
+++ b/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java
@@ -284,7 +284,7 @@ class OpenIdServiceImpl {
         // right now. Instead of blocking all of them log the error and
         // let the authentication complete anyway.
         //
-        logger.atSevere().log("Invalid PAPE response %s: %s", openidIdentifier, err);
+        logger.atSevere().withCause(err).log("Invalid PAPE response from %s", openidIdentifier);
         unsupported = true;
         ext = null;
       }
diff --git a/java/com/google/gerrit/server/config/PluginConfigFactory.java b/java/com/google/gerrit/server/config/PluginConfigFactory.java
index 842c79c060..483fc0a12b 100644
--- a/java/com/google/gerrit/server/config/PluginConfigFactory.java
+++ b/java/com/google/gerrit/server/config/PluginConfigFactory.java
@@ -230,7 +230,8 @@ public class PluginConfigFactory implements ReloadPluginListener {
       cfg.load();
     } catch (ConfigInvalidException e) {
       // This is an error in user input, don't spam logs with a stack trace.
-      logger.atWarning().log("Failed to load %s: %s", pluginConfigFile.toAbsolutePath(), e);
+      logger.atWarning().log(
+          "Failed to load %s: %s", pluginConfigFile.toAbsolutePath(), e.getMessage());
     } catch (IOException e) {
       logger.atWarning().withCause(e).log("Failed to load %s", pluginConfigFile.toAbsolutePath());
     }
diff --git a/java/com/google/gerrit/server/patch/Text.java b/java/com/google/gerrit/server/patch/Text.java
index f127f44e03..cc0a5e40e4 100644
--- a/java/com/google/gerrit/server/patch/Text.java
+++ b/java/com/google/gerrit/server/patch/Text.java
@@ -162,11 +162,11 @@ public class Text extends RawText {
       return Charset.forName(encoding);
 
     } catch (IllegalCharsetNameException err) {
-      logger.atSevere().log("Invalid detected charset name '%s': %s", encoding, err);
+      logger.atSevere().log("Invalid detected charset name '%s': %s", encoding, err.getMessage());
       return ISO_8859_1;
 
     } catch (UnsupportedCharsetException err) {
-      logger.atSevere().log("Detected charset '%s' not supported: %s", encoding, err);
+      logger.atSevere().log("Detected charset '%s' not supported: %s", encoding, err.getMessage());
       return ISO_8859_1;
     }
   }