diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java
index 167712518a701e..a01d28444be27d 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java
@@ -259,12 +259,12 @@ public static void main(String[] args) throws Exception {
       Files.copy(processedManifest, options.manifestOutput);
     } catch (MergeConflictException e) {
       logger.log(Level.SEVERE, e.getMessage());
-      System.exit(1);
+      throw e;
     } catch (MergingException e) {
       logger.log(Level.SEVERE, "Error during merging resources", e);
       throw e;
     } catch (AndroidManifestProcessor.ManifestProcessingException e) {
-      System.exit(1);
+      throw e;
     } catch (Exception e) {
       logger.log(Level.SEVERE, "Unexpected", e);
       throw e;