Merge "Fix latent NPE issues."
authorSam Hague <shague@redhat.com>
Mon, 13 Apr 2015 18:07:43 +0000 (18:07 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 13 Apr 2015 18:07:44 +0000 (18:07 +0000)

Trivial merge