I don't think there should be a client check in there at all.