Fix regression due to lack of braces

We didn't use braces {} for a conditional, and we added another
statement below it.  This had us only executing the first statement
when the 'if' was true, and then returning an error in all cases.

We use braces to fix this, and also fix the other indenting.

Test: TreeHugger
Bug: 193268714
Change-Id: Ib26c0d0ab7f47451aa4980b06886e5e7fd2a0805