tree ce74512b41f69ceb5e3be5618d1935b3cdb9db25
parent 1ae26c6c2812ce247f608c0aa782015b361ffd76
author Ray Milkey <ray@opennetworking.org> 1531237810 -0700
committer Ray Milkey <ray@opennetworking.org> 1531239183 +0000

Fix Sonar warnings about NPEs after an exception

Change-Id: Ic6ddfe4cef6a1e1df32b896a2dfdbc6053d0a4eb