Corrected a bug regarding null set.