fixed: handle invalid client + performance test