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