Fix runtime issue with null pointer.

This seems like the pattern that we're going to have to follow if I plan
on using protobuf buffers for these structures that need to be serialized.