fix Whirligig behavior on errors