Add extra braces to avoid ambiguous if-else.

Also, free() doesn't need a check.