Fix nil checks, so that vayacondios client doesn't fail when no server is available

Change-Id: Ifbdd4b4427836c6c28bc075c0f5a5cd0f14cdb7c
Merge "Fix nil checks, so that vayacondios client doesn't fail when no server is available"