Add the CommandError to thrown CommandExceptions to allow for manual handling