Fix latent NPE issues.
authorEd Warnicke <eaw@cisco.com>
Sun, 12 Apr 2015 02:37:12 +0000 (19:37 -0700)
committerEd Warnicke <eaw@cisco.com>
Mon, 13 Apr 2015 17:49:16 +0000 (17:49 +0000)
commit78de45efd8a2b6428f230cdee30761b177b9529c
treed3d977e27ee39a177e3ae36efcd219602748dc89
parent89347c4075b117f7aee3bc1ecef550cd2c711b16
Fix latent NPE issues.

I didn't trip on these, but I tripped on their analog with
protocols... so fixing them here.

Change-Id: I23bf647988bade95d66a8c9ecbf7bd32b7980ce1
Signed-off-by: Ed Warnicke <eaw@cisco.com>