Change CommandStop exception to CommandDone