From bdf7e4c97b3d5e1d0d6a33903ac52f3a03459a0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Mon, 11 Jan 2016 22:50:52 +1300
Subject: [PATCH] add #275 to changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53baefb..8430166 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## unreleased
+
+ * improve error handling in case of an exception during transitioning (see [issue #275](https://github.com/aasm/aasm/pull/275) for details, thanks to [@chriswoodrich](https://github.com/chriswoodrich))
+
 ## 4.7.0
 
  * fix: allow :send as event name (see [issue #257](https://github.com/aasm/aasm/issues/257) for details)