[FIXED JENKINS-23494] Avoid empty commands and thus various strange states