diff --git a/cli/src/main/java/com/liferay/blade/cli/util/StringUtil.java b/cli/src/main/java/com/liferay/blade/cli/util/StringUtil.java
index 3a2b466d8..fbc19ae4b 100644
--- a/cli/src/main/java/com/liferay/blade/cli/util/StringUtil.java
+++ b/cli/src/main/java/com/liferay/blade/cli/util/StringUtil.java
@@ -32,10 +32,8 @@ public static boolean equals(String s1, Object o) {
 	}
 
 	public static boolean isNullOrEmpty(String arg) {
-		boolean hasContent = Optional.of(
+		boolean hasContent = Optional.ofNullable(
 			arg
-		).filter(
-			s -> s != null
 		).map(
 			String::trim
 		).filter(