additional fixes to stop spinners on errors.