diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
--- a/CHANGELOG
+++ /dev/null
@@ -1,9 +0,0 @@
-- 0.2.0
-    * Export unsafeURI convenience function.
-    * Add usage examples.
-
-- 0.1.1
-    * Loosen constraint on base.
-
-- 0.1.0
-    * First release.
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,26 @@
+- 0.2.5
+    * Make `unsafeURI` throw a more helpful error. Thanks
+      [@emhoracek](https://github.com/emhoracek)!
+
+- 0.2.4
+    * Move to Stack.
+    * Minor documentation adjustments.
+
+- 0.2.3
+    * Drop dependency on `old-locale` package.
+
+- 0.2.2
+    * Improve documentation.
+
+- 0.2.1
+    * Add README and documentation.
+
+- 0.2.0
+    * Export unsafeURI convenience function.
+    * Add usage examples.
+
+- 0.1.1
+    * Loosen constraint on base.
+
+- 0.1.0
+    * First release.
diff --git a/atom-basic.cabal b/atom-basic.cabal
--- a/atom-basic.cabal
+++ b/atom-basic.cabal
@@ -1,5 +1,5 @@
 name:                atom-basic
-version:             0.2.4
+version:             0.2.5
 synopsis:            Basic Atom feed construction
 description:
 
@@ -19,7 +19,7 @@
 build-type:          Simple
 cabal-version:       >=1.10
 Extra-source-files:
-    CHANGELOG
+    CHANGELOG.md
 
 source-repository head
   type:     git
diff --git a/src/Web/Atom.hs b/src/Web/Atom.hs
--- a/src/Web/Atom.hs
+++ b/src/Web/Atom.hs
@@ -75,7 +75,7 @@
 import           Data.ByteString        (ByteString)
 import qualified Data.ByteString.Base64 as B64
 import qualified Data.ByteString.Char8  as BC
-import           Data.Maybe             (catMaybes, fromJust)
+import           Data.Maybe             (catMaybes)
 import           Data.String            (IsString (..))
 import qualified Data.Text              as T
 import qualified Data.Text.Encoding     as T (decodeUtf8)
@@ -132,7 +132,9 @@
 -- function is partial so only use this if you're hardcoding the URI string and
 -- you're sure that it's valid./
 unsafeURI :: String -> URI
-unsafeURI = fromJust . parseURI
+unsafeURI s = case parseURI s of
+    Just uri-> uri
+    Nothing -> error $ "Unable to parse URI string: " ++ s
 
 -- -------------------------
 -- External XML construction