Added blank name checks