Fix FormatCommand with Null values