Better handling of empty commands