diff --git a/0004-Port-to-current-maven-shared-utils.patch b/0004-Port-to-current-maven-shared-utils.patch
index 1b30f57..1de8754 100644
--- a/0004-Port-to-current-maven-shared-utils.patch
+++ b/0004-Port-to-current-maven-shared-utils.patch
@@ -1,14 +1,6 @@
 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java	2022-04-26 11:44:38.061316377 +0200
 +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java	2022-04-26 11:50:27.427430853 +0200
-@@ -22,6 +22,7 @@
- import org.apache.maven.plugin.surefire.JdkAttributes;
- import org.apache.maven.plugin.surefire.booterclient.lazytestprovider.OutputStreamFlushableCommandline;
- import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
-+import org.apache.maven.shared.utils.cli.CommandLineException;
- import org.apache.maven.surefire.booter.AbstractPathConfiguration;
- import org.apache.maven.surefire.booter.Classpath;
- import org.apache.maven.surefire.booter.StartupConfiguration;
-@@ -130,14 +131,26 @@
+@@ -130,14 +130,24 @@
          String jvmArgLine = newJvmArgLine( forkNumber );
          if ( !jvmArgLine.isEmpty() )
          {
@@ -18,9 +10,8 @@
 +            {
 +                cli.createArg().setLine( jvmArgLine );
 +            }
-+            catch ( CommandLineException e )
++            finally
 +            {
-+                throw new SurefireBooterForkException( "Problem to set jvmArgLine: " + e.getMessage(), e );
 +            }
          }
  
@@ -32,9 +23,8 @@
 +            {
 +                cli.createArg().setLine( getDebugLine() );
 +            }
-+            catch ( CommandLineException e )
++            finally
 +            {
-+                throw new SurefireBooterForkException( "Problem to set debug line: " + e.getMessage(), e );
 +            }
          }