diff --git a/Yesod/Handler.hs b/Yesod/Handler.hs
index 0054da91..a4095cbf 100644
--- a/Yesod/Handler.hs
+++ b/Yesod/Handler.hs
@@ -363,8 +363,9 @@ setMessage = setSession msgKey . lbsToChars . renderHtml
 -- See 'setMessage'.
 getMessage :: GHandler sub master (Maybe Html)
 getMessage = do
+    mmsg <- fmap (fmap preEscapedString) $ lookupSession msgKey
     deleteSession msgKey
-    fmap (fmap preEscapedString) $ lookupSession msgKey
+    return mmsg
 
 -- | Bypass remaining handler code and output the given file.
 --
diff --git a/yesod.cabal b/yesod.cabal
index feaa78c3..1f78c41a 100644
--- a/yesod.cabal
+++ b/yesod.cabal
@@ -1,5 +1,5 @@
 name:            yesod
-version:         0.6.0
+version:         0.6.0.1
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>