Fix an exception on empty commands