diff --git a/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java b/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
index 6ff4f2cd9a2d..861787ce96f9 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
@@ -507,14 +507,13 @@ public abstract class VirtualFile extends UserDataHolderBase implements Modifica
   }
 
   public void setBinaryContent(@NotNull byte[] content, long newModificationStamp, long newTimeStamp, Object requestor) throws IOException {
-    OutputStream outputStream = null;
+    final OutputStream outputStream = getOutputStream(requestor, newModificationStamp, newTimeStamp);
     try {
-      outputStream = getOutputStream(requestor, newModificationStamp, newTimeStamp);
       outputStream.write(content);
       outputStream.flush();
     }
     finally {
-      if (outputStream != null) outputStream.close();
+      outputStream.close();
     }
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/LocalFileSystemTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/LocalFileSystemTest.java
index 6eff32f81659..b82f1896fc9a 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/LocalFileSystemTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/LocalFileSystemTest.java
@@ -206,6 +206,7 @@ public class LocalFileSystemTest extends PlatformLangTestCase {
 
     final boolean safeWrite = GeneralSettings.getInstance().isUseSafeWrite();
     final File dir = FileUtil.createTempDirectory("hardlinks.", ".dir", false);
+    final SafeWriteRequestor requestor = new SafeWriteRequestor() { };
     try {
       GeneralSettings.getInstance().setUseSafeWrite(false);
 
@@ -215,7 +216,7 @@ public class LocalFileSystemTest extends PlatformLangTestCase {
 
       final VirtualFile file = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(targetFile);
       assertNotNull(file);
-      file.setBinaryContent("hello".getBytes(), 0, 0, new SafeWriteRequestor() {});
+      file.setBinaryContent("hello".getBytes(), 0, 0, requestor);
 
       final VirtualFile check = LocalFileSystem.getInstance().findFileByIoFile(hardLinkFile);
       assertNotNull(check);