diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunArguments.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunArguments.java
index 6888043c6a33..ed2d40d4fc8f 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunArguments.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunArguments.java
@@ -21,6 +21,8 @@
 
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 
+import org.springframework.util.StringUtils;
+
 /**
  * Parse and expose arguments specified in a single string.
  *
@@ -31,14 +33,16 @@ class RunArguments {
 
 	private static final String[] NO_ARGS = {};
 
-	private final LinkedList<String> args;
+	private final LinkedList<String> args = new LinkedList<>();
 
 	RunArguments(String arguments) {
 		this(parseArgs(arguments));
 	}
 
 	RunArguments(String[] args) {
-		this.args = new LinkedList<>(Arrays.asList(args));
+		if (args != null) {
+			Arrays.stream(args).filter(StringUtils::hasLength).forEach(this.args::add);
+		}
 	}
 
 	public LinkedList<String> getArgs() {
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/RunArgumentsTests.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/RunArgumentsTests.java
index 486270258ca5..e2184f0a9cc5 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/RunArgumentsTests.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/RunArgumentsTests.java
@@ -34,6 +34,20 @@ public void parseNull() {
 		assertThat(args.length).isEqualTo(0);
 	}
 
+	@Test
+	public void parseNullArray() {
+		String[] args = new RunArguments((String[]) null).asArray();
+		assertThat(args).isNotNull();
+		assertThat(args.length).isEqualTo(0);
+	}
+
+	@Test
+	public void parseArrayContainingNullValue() {
+		String[] args = new RunArguments(new String[]{null}).asArray();
+		assertThat(args).isNotNull();
+		assertThat(args.length).isEqualTo(0);
+	}
+
 	@Test
 	public void parseEmpty() {
 		String[] args = parseArgs("   ");