diff --git a/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java b/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java
index 37cda4ea5ab..a42154446f4 100644
--- a/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java
+++ b/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java
@@ -190,6 +190,12 @@ public class BytecodeCompiler {
                 throw new CompileEnvironmentException(errorMessage(src, false));
             }
         }
+        catch (BuildException e) {
+            throw e;
+        }
+        catch (CompileEnvironmentException e) {
+            throw e;
+        }
         catch (Exception e) {
             throw new CompileEnvironmentException(errorMessage(src, true), e);
         }
@@ -222,6 +228,12 @@ public class BytecodeCompiler {
                 throw new CompileEnvironmentException(errorMessage(src, false));
             }
         }
+        catch (BuildException e) {
+            throw e;
+        }
+        catch (CompileEnvironmentException e) {
+            throw e;
+        }
         catch (Exception e) {
             throw new CompileEnvironmentException(errorMessage(src, true), e);
         }
@@ -262,6 +274,12 @@ public class BytecodeCompiler {
                 throw new CompileEnvironmentException(errorMessage(new String[]{module}, false));
             }
         }
+        catch (BuildException e) {
+            throw e;
+        }
+        catch (CompileEnvironmentException e) {
+            throw e;
+        }
         catch (Exception e) {
             throw new CompileEnvironmentException(errorMessage(new String[]{module}, true), e);
         }