Fix clang error: add explicit braces to avoid dangling else

Fix clang error: add explicit braces to avoid dangling else #5899