diff --git a/platform/util/src/com/intellij/execution/process/BaseOSProcessHandler.java b/platform/util/src/com/intellij/execution/process/BaseOSProcessHandler.java
index e249924aea6f..364798b5004b 100644
--- a/platform/util/src/com/intellij/execution/process/BaseOSProcessHandler.java
+++ b/platform/util/src/com/intellij/execution/process/BaseOSProcessHandler.java
@@ -199,18 +199,9 @@ public class BaseOSProcessHandler extends ProcessHandler implements TaskExecutor
 
   @NotNull
   private Reader createInputStreamReader(@NotNull InputStream streamToRead) {
-    Charset charset = charsetNotNull();
-    return new BaseInputStreamReader(streamToRead, charset);
-  }
-
-  @NotNull
-  private Charset charsetNotNull() {
     Charset charset = getCharset();
-    if (charset == null) {
-      // use default charset
-      charset = Charset.defaultCharset();
-    }
-    return charset;
+    if (charset == null) charset = Charset.defaultCharset();
+    return new BaseInputStreamReader(streamToRead, charset);
   }
 
   @Override
diff --git a/platform/util/src/com/intellij/util/io/BaseDataReader.java b/platform/util/src/com/intellij/util/io/BaseDataReader.java
index f5ac7007a72d..6f974b5d8ff7 100644
--- a/platform/util/src/com/intellij/util/io/BaseDataReader.java
+++ b/platform/util/src/com/intellij/util/io/BaseDataReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ public abstract class BaseDataReader {
   private Future<?> myFinishedFuture;
 
   public BaseDataReader(SleepingPolicy sleepingPolicy) {
-    mySleepingPolicy = sleepingPolicy != null ? sleepingPolicy: SleepingPolicy.SIMPLE;
+    mySleepingPolicy = sleepingPolicy != null ? sleepingPolicy : SleepingPolicy.SIMPLE;
   }
 
   /** @deprecated use {@link #start(String)} instead (to be removed in IDEA 17) */
diff --git a/platform/util/src/com/intellij/util/io/BaseInputStreamReader.java b/platform/util/src/com/intellij/util/io/BaseInputStreamReader.java
index b8446184fbd7..44e02f6a9755 100644
--- a/platform/util/src/com/intellij/util/io/BaseInputStreamReader.java
+++ b/platform/util/src/com/intellij/util/io/BaseInputStreamReader.java
@@ -28,13 +28,13 @@ import java.nio.charset.Charset;
 public class BaseInputStreamReader extends InputStreamReader {
   private final InputStream myInputStream;
 
-  public BaseInputStreamReader(@NotNull InputStream in, @NotNull Charset cs) {
-    super(in, cs);
+  public BaseInputStreamReader(@NotNull InputStream in) {
+    super(in);
     myInputStream = in;
   }
 
-  public BaseInputStreamReader(InputStream in) {
-    super(in);
+  public BaseInputStreamReader(@NotNull InputStream in, @NotNull Charset cs) {
+    super(in, cs);
     myInputStream = in;
   }