ENG-4213: Hofix for NPE
If/else logic was wrong.
Merge pull request #341 from VoltDB/ENG-4213-clientnpehotfix

ENG-4213: Hofix for NPE