diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
index a814125bdeee..93d8260b8709 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
@@ -580,7 +580,7 @@ public class JavaBuilder extends Builder{
       final String srcPath;
       final JavaFileObject source = diagnostic.getSource();
       if (source != null) {
-        srcPath = FileUtil.toSystemIndependentName(new File(source.toUri()).getPath());
+        srcPath = FileUtil.toSystemIndependentName(source.toUri().getPath());
       }
       else {
         srcPath = null;
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavacFileManager.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavacFileManager.java
index 96743e7cac27..3864c17bec0a 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavacFileManager.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavacFileManager.java
@@ -2,6 +2,7 @@ package org.jetbrains.jps.incremental.java;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jps.incremental.Paths;
 
 import javax.tools.*;
 import java.io.File;
@@ -111,7 +112,7 @@ class JavacFileManager extends ForwardingJavaFileManager<StandardJavaFileManager
         }
       }
     }
-    final File file = (dir == null? new File(fileName) : new File(dir, fileName));
+    final File file = (dir == null? new File(fileName).getAbsoluteFile() : new File(dir, fileName));
     return new OutputFileObject(myContext, file, kind, className, src);
   }
 
@@ -119,7 +120,7 @@ class JavacFileManager extends ForwardingJavaFileManager<StandardJavaFileManager
     if (loc == StandardLocation.CLASS_OUTPUT) {
       if (myOutputsMap.size() > 1 && sourceFile != null) {
         // multiple outputs case
-        final File outputDir = findOutputDir(new File(sourceFile.toUri()));
+        final File outputDir = findOutputDir(new File(Paths.toURI(sourceFile.toUri().getPath())));
         if (outputDir != null) {
           return outputDir;
         }