Added check for basecomm
Added check for valid Client