Corrected completed count and added name error checking