1 files changed, 4 insertions, 1 deletions
diff --git a/luni/src/main/java/java/io/OutputStreamWriter.java b/luni/src/main/java/java/io/OutputStreamWriter.java
index bc8710d..8a639e7 100644
--- a/luni/src/main/java/java/io/OutputStreamWriter.java
+++ b/luni/src/main/java/java/io/OutputStreamWriter.java
@@ -116,7 +116,10 @@ public class OutputStreamWriter extends Writer {
      */
     public OutputStreamWriter(OutputStream out, CharsetEncoder charsetEncoder) {
         super(out);
-        charsetEncoder.charset();
+        if (charsetEncoder == null) {
+            throw new NullPointerException("charsetEncoder == null");
+        }
+
         this.out = out;
         encoder = charsetEncoder;
     }