CommandError looks like it's not used. I only noticed this because of the comment below.