added check for length of client information