Commit 1. Description: Added check for the client..
Commit 1. Description: Added check for the client..