From 96b7666e50126dc515bb7bf2f9a79090ad7d8806 Mon Sep 17 00:00:00 2001
From: Pete Cook <pete@cookpete.com>
Date: Fri, 9 Sep 2016 08:16:01 +0100
Subject: [PATCH] Improve error handling

---
 src/index.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/index.js b/src/index.js
index f0631ba0..24054a72 100755
--- a/src/index.js
+++ b/src/index.js
@@ -21,12 +21,6 @@ commander
   .version(version)
   .parse(process.argv)
 
-const Template = templates[commander.template]
-
-if (!Template) {
-  throw new Error(`Template '${commander.template}' was not found`)
-}
-
 function getCommits () {
   return cmd(`git log --shortstat --pretty=format:${LOG_FORMAT}`).then(parseCommits)
 }
@@ -53,6 +47,11 @@ function getPackageVersion () {
 }
 
 function generateLog ([ commits, origin, packageVersion ]) {
+  const Template = templates[commander.template]
+  if (!Template) {
+    throw new Error(`Template '${commander.template}' was not found`)
+  }
+
   const releases = parseReleases(commits, packageVersion)
   const log = new Template(origin).render(releases)
 
@@ -71,9 +70,9 @@ function success (log) {
 }
 
 function error (error) {
-  throw new Error(error)
+  console.error(error.message)
 }
 
 const promises = [ getCommits(), parseOrigin(), getPackageVersion() ]
 
-Promise.all(promises).then(generateLog).then(success, error)
+Promise.all(promises).then(generateLog).then(success).catch(error)