Slap some ugly NSNull checks into the client.