diff --git a/lib/formatCommitMessage.js b/lib/formatCommitMessage.js
index 7c4324c2..45c8bc7c 100644
--- a/lib/formatCommitMessage.js
+++ b/lib/formatCommitMessage.js
@@ -1,3 +1,5 @@
+/* eslint-disable complexity */
+
 const wrap = require('word-wrap');
 
 const MAX_LINE_WIDTH = 72;
@@ -38,7 +40,7 @@ const formatCommitMessage = (state) => {
   const affectsLine = makeAffectsLine(answers);
 
   // Wrap these lines at MAX_LINE_WIDTH character
-  const body = wrap(answers.body + affectsLine, wrapOptions);
+  const body = wrap((answers.body || '') + affectsLine, wrapOptions);
   const breaking = wrap(answers.breaking, wrapOptions);
   const issues = wrap(answers.issues, wrapOptions);