Fixed return errors.