diff --git a/pom.xml b/pom.xml
index 5ae10a50619..9e1b5c4eb46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,7 +277,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.6.1</version>
 
                 <configuration>
                     <filters>
diff --git a/shade-test.sh b/shade-test.sh
index be82d92cb05..defc07d820c 100755
--- a/shade-test.sh
+++ b/shade-test.sh
@@ -1,5 +1,8 @@
 # Create the package. Skip tests since this is just for testing the contents of the jar. We've already run the tests in another step.
 mvn package -DskipTests -Dmaven.javadoc.skip=true
+if [ $? -ne 0 ]; then
+  exit 1
+fi
 # List everything in the shaded jar. Anything in com/datadog is good since that's either shaded or our own code.
 # We intentionally avoid shading anything in META-INF in the pom.xml.
 # And there are some native libraries in other directories that we don't shade so we only want to check for .class files.