Added check for existing billy client class