do some update; add a check for client (#476)

do some update; add a check for client (#476) #171