Fixed nil-client bug introduced in c4214cce

Change-Id: I1f75443d3678f30bcd15baca53679482102e8e17