Give me one more }

Needed to fix build and fix and complete the NPE fix

Change-Id: Ie0c5ef1dcf70d7f348478eea52628cbc289b6ddd