Cleaning up and adding error event context to CommandException