Wrapped code block of conditional statement with {}, so that the second statement is now included in the conditional.  Found by gcc 6 -Wmisleading-indentation.
Wrapped code block of conditional statement with {}, so that the
second statement is now included in the conditional.  Found by
gcc 6 -Wmisleading-indentation.

(cherry picked from commit 9626eb33ed5ff7c59776081e1a58a20a1eed96be)

mcr/nmh,mcr/nmh