Small bug fix and lib updates

Third times the charm! Small NPE bug fixes as well as v1beta16 update.

Reviewed in https://codereview.appspot.com/14803043/