diff --git a/.clang-format b/.clang-format
index e2fc2068a9..04c1f8b3a2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -67,6 +67,7 @@ IncludeCategories:
   - Regex:           '.*'
     Priority:        0
 IndentExternBlock: NoIndent
+InsertBraces: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 MaxEmptyLinesToKeep: 1
 PenaltyBreakAssignment: 30
diff --git a/.clang-format.headers b/.clang-format.headers
index 8a4f06661d..ff9370413e 100644
--- a/.clang-format.headers
+++ b/.clang-format.headers
@@ -55,6 +55,7 @@ IncludeCategories:
   - Regex:           '".*"'
     Priority:        9
 IndentExternBlock: NoIndent
+InsertBraces: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 MaxEmptyLinesToKeep: 1
 PenaltyBreakAssignment: 30
diff --git a/lib/isc/picohttpparser.c b/lib/isc/picohttpparser.c
index ba1d291343..0545624e54 100644
--- a/lib/isc/picohttpparser.c
+++ b/lib/isc/picohttpparser.c
@@ -739,7 +739,9 @@ Exit:
 		if (decoder->_total_overhead >= 100 * 1024 &&
 		    decoder->_total_read - decoder->_total_overhead <
 			    decoder->_total_read / 4)
+		{
 			ret = -1;
+		}
 	}
 	return ret;
 }