diff --git a/build.gradle b/build.gradle
index 0b7341f..be16c37 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,7 @@ dependencies {
 	implementation ('com.google.code.gson:gson:2.8.5')
 	implementation ('com.google.guava:guava:27.0-jre')
 	implementation ('net.fabricmc:stitch:0.1.0.+')
-	implementation ('net.fabricmc:tiny-remapper:0.1.0.16') {
+	implementation ('net.fabricmc:tiny-remapper:0.1.0.17') {
 		transitive = false
 	}
 
diff --git a/src/main/java/net/fabricmc/loom/util/MapJarsTiny.java b/src/main/java/net/fabricmc/loom/util/MapJarsTiny.java
index 0d2b848..71ffc2f 100644
--- a/src/main/java/net/fabricmc/loom/util/MapJarsTiny.java
+++ b/src/main/java/net/fabricmc/loom/util/MapJarsTiny.java
@@ -64,9 +64,7 @@ public class MapJarsTiny {
 					.withMappings(TinyUtils.createTinyMappingProvider(mappings, fromM, toM))
 					.build();
 
-			OutputConsumerPath outputConsumer = null;
-			try {
-				outputConsumer = new OutputConsumerPath(output);
+			try (OutputConsumerPath outputConsumer = new OutputConsumerPath(output)) {
 				outputConsumer.addNonClassFiles(input);
 				remapper.read(input);
 				remapper.read(classpath);
@@ -74,13 +72,6 @@ public class MapJarsTiny {
 			} catch (Exception e) {
 				throw new RuntimeException("Failed to remap JAR", e);
 			} finally {
-				if (outputConsumer != null) {
-					try {
-						outputConsumer.finish();
-					} catch (Exception e) {
-						e.printStackTrace();
-					}
-				}
 				remapper.finish();
 			}
 		}
diff --git a/src/main/java/net/fabricmc/loom/util/ModProcessor.java b/src/main/java/net/fabricmc/loom/util/ModProcessor.java
index 4c2c2dd..c095495 100644
--- a/src/main/java/net/fabricmc/loom/util/ModProcessor.java
+++ b/src/main/java/net/fabricmc/loom/util/ModProcessor.java
@@ -99,9 +99,7 @@ public class ModProcessor {
 			.withMappings(TinyUtils.createTinyMappingProvider(mappings, fromM, toM))
 			.build();
 
-		OutputConsumerPath outputConsumer = null;
-		try {
-			outputConsumer = new OutputConsumerPath(Paths.get(output.getAbsolutePath()));
+		try (OutputConsumerPath outputConsumer = new OutputConsumerPath(Paths.get(output.getAbsolutePath()))) {
 			outputConsumer.addNonClassFiles(input.toPath());
 			if (!modCompileFiles.contains(input)) {
 				remapper.read(input.toPath());
@@ -113,13 +111,6 @@ public class ModProcessor {
 		} catch (Exception e){
 			throw new RuntimeException("Failed to remap JAR to " + toM, e);
 		} finally {
-			if (outputConsumer != null) {
-				try {
-					outputConsumer.finish();
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
 			remapper.finish();
 		}
 
diff --git a/src/main/java/net/fabricmc/loom/util/ModRemapper.java b/src/main/java/net/fabricmc/loom/util/ModRemapper.java
index 310f69e..7c2ae02 100644
--- a/src/main/java/net/fabricmc/loom/util/ModRemapper.java
+++ b/src/main/java/net/fabricmc/loom/util/ModRemapper.java
@@ -79,9 +79,7 @@ public class ModRemapper {
 
 		TinyRemapper remapper = remapperBuilder.build();
 
-		OutputConsumerPath outputConsumer = null;
-		try {
-			outputConsumer = new OutputConsumerPath(modJarOutputPath);
+		try (OutputConsumerPath outputConsumer = new OutputConsumerPath(modJarOutputPath)) {
 			outputConsumer.addNonClassFiles(modJarPath);
 			remapper.read(classpath);
 			remapper.read(modJarPath);
@@ -89,13 +87,6 @@ public class ModRemapper {
 		} catch (Exception e) {
 			throw new RuntimeException("Failed to remap JAR", e);
 		} finally {
-			if (outputConsumer != null) {
-				try {
-					outputConsumer.finish();
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
 			remapper.finish();
 		}