diff --git a/plugin/src/main/java/org/wildfly/plugin/cli/ScriptWriter.java b/plugin/src/main/java/org/wildfly/plugin/cli/ScriptWriter.java
index 831b9405..c6312ab3 100644
--- a/plugin/src/main/java/org/wildfly/plugin/cli/ScriptWriter.java
+++ b/plugin/src/main/java/org/wildfly/plugin/cli/ScriptWriter.java
@@ -51,6 +51,9 @@ static Path create(final BaseCommandConfiguration config) throws IOException {
             boolean inTry = false;
 
             for (String cmd : config.getCommands()) {
+                if (cmd == null || cmd.isEmpty()) {
+                    continue;
+                }
                 if (config.isFailOnError()) {
                     writeCommand(writer, cmd);
                 } else {