Now using IsNullOrWhiteSpace instead of IsNullOrEmpty.