diff --git a/platform/platform-api/src/com/intellij/execution/process/BinaryOSProcessHandler.java b/platform/platform-api/src/com/intellij/execution/process/BinaryOSProcessHandler.java
index 220a252d8015..7ca4cbc479af 100644
--- a/platform/platform-api/src/com/intellij/execution/process/BinaryOSProcessHandler.java
+++ b/platform/platform-api/src/com/intellij/execution/process/BinaryOSProcessHandler.java
@@ -21,8 +21,10 @@ import com.intellij.openapi.util.io.BufferExposingByteArrayOutputStream;
 import com.intellij.util.io.BaseDataReader;
 import com.intellij.util.io.BinaryOutputReader;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.InputStream;
+import java.nio.charset.Charset;
 import java.util.concurrent.Future;
 
 public class BinaryOSProcessHandler extends OSProcessHandler {
@@ -32,9 +34,13 @@ public class BinaryOSProcessHandler extends OSProcessHandler {
     super(commandLine);
   }
 
+  public BinaryOSProcessHandler(@NotNull Process process, @NotNull String commandLine, @Nullable Charset charset) {
+    super(process, commandLine, charset);
+  }
+
   @NotNull
   public byte[] getOutput() {
-    return myOutput.getInternalBuffer();
+    return myOutput.toByteArray();
   }
 
   @NotNull
diff --git a/platform/platform-tests/testSrc/com/intellij/execution/process/BinaryOSProcessHandlerTest.java b/platform/platform-tests/testSrc/com/intellij/execution/process/BinaryOSProcessHandlerTest.java
new file mode 100644
index 000000000000..38dc5cdb98ba
--- /dev/null
+++ b/platform/platform-tests/testSrc/com/intellij/execution/process/BinaryOSProcessHandlerTest.java
@@ -0,0 +1,86 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.execution.process;
+
+import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.util.text.StringUtil;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.*;
+
+public class BinaryOSProcessHandlerTest {
+  @Test
+  public void test() throws Exception {
+    TestBinaryOSProcessHandler handler = new TestBinaryOSProcessHandler(launchTest());
+    handler.startNotify();
+    assertTrue(handler.waitFor(60 * 1000));
+    assertEquals(0, handler.exitCode);
+    assertThat(handler.stdErr.toString()).isEqualTo(Runner.TEXT);
+    assertThat(handler.getOutput()).containsExactly(Runner.BYTES);
+  }
+
+  private static Process launchTest() throws URISyntaxException, IOException {
+    String java = System.getProperty("java.home") + (SystemInfo.isWindows ? "\\bin\\java.exe" : "/bin/java");
+
+    String className = Runner.class.getName();
+    URL url = Runner.class.getClassLoader().getResource(className.replace('.', '/') + ".class");
+    assertNotNull(url);
+    File dir = new File(url.toURI());
+    for (int i = 0; i < StringUtil.countChars(className, '.') + 1; i++) dir = dir.getParentFile();
+
+    String[] cmd = {java, "-cp", dir.getPath(), className};
+    return new ProcessBuilder(cmd).redirectErrorStream(false).start();
+  }
+
+  private static class TestBinaryOSProcessHandler extends BinaryOSProcessHandler {
+    private final StringBuilder stdErr = new StringBuilder();
+    private int exitCode = -1;
+
+    public TestBinaryOSProcessHandler(Process process) {
+      super(process, "test", null);
+    }
+
+    @Override
+    public void notifyTextAvailable(String text, Key outputType) {
+      if (outputType != ProcessOutputTypes.SYSTEM) {
+        stdErr.append(text);
+      }
+    }
+
+    @Override
+    protected void notifyProcessTerminated(int exitCode) {
+      super.notifyProcessTerminated(exitCode);
+      this.exitCode = exitCode;
+    }
+  }
+
+  public static class Runner {
+    private static final String TEXT = "some\ntext";
+    private static final byte[] BYTES = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+
+    public static void main(String[] args) throws IOException {
+      System.err.print(TEXT);
+      System.out.write(BYTES);
+    }
+  }
+}
\ No newline at end of file