diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/actions/LogActionImpl.java b/src/main/java/org/jenkinsci/plugins/workflow/support/actions/LogActionImpl.java
index 9fec8cfa..05a9c8e8 100644
--- a/src/main/java/org/jenkinsci/plugins/workflow/support/actions/LogActionImpl.java
+++ b/src/main/java/org/jenkinsci/plugins/workflow/support/actions/LogActionImpl.java
@@ -134,11 +134,7 @@ public AnnotatedLargeText<? extends FlowNode> getLogText() {
         } catch (IOException e) {
             ByteBuffer buf = new ByteBuffer();
             PrintStream ps;
-            try {
-                ps = new PrintStream(buf, false, "UTF-8");
-            } catch (UnsupportedEncodingException x) {
-                throw new AssertionError(x);
-            }
+            ps = new PrintStream(buf, false, StandardCharsets.UTF_8);
             ps.println("Failed to find log file for id="+parent.getId());
             e.printStackTrace(ps);
             ps.close();
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/input/POSTHyperlinkNote.java b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/input/POSTHyperlinkNote.java
index af514f05..660fa6b4 100644
--- a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/input/POSTHyperlinkNote.java
+++ b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/input/POSTHyperlinkNote.java
@@ -93,12 +93,8 @@ public POSTHyperlinkNote(String url, int length) {
      */
     private static String encodeForJavascript(String str) {
         // https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
-        try {
-            String encode = URLEncoder.encode(str, StandardCharsets.UTF_8.name());
-            return Base64.getUrlEncoder().encodeToString(encode.getBytes(StandardCharsets.UTF_8));
-        } catch (UnsupportedEncodingException e) {
-            throw new InternalError("UTF-8 is missing but mandated by the JVM specification", e);
-        }
+        String encode = URLEncoder.encode(str, StandardCharsets.UTF_8);
+        return Base64.getUrlEncoder().encodeToString(encode.getBytes(StandardCharsets.UTF_8));
     }
 
     // TODO why does there need to be a descriptor at all?