add missing check for default is None