[client] chore(merge): add null checks for backwards compatibilty (#243)

[client] chore(merge): add null checks for backwards compatibilty (#243) #204