diff --git a/CHANGELOG b/CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+- 0.9.6.1
+    * Fix issue with fragmentation test
+
 - 0.9.6.0
     * Optionally include example server in the cabal file
     * Send correct port from client
diff --git a/tests/haskell/Network/WebSockets/Tests.hs b/tests/haskell/Network/WebSockets/Tests.hs
--- a/tests/haskell/Network/WebSockets/Tests.hs
+++ b/tests/haskell/Network/WebSockets/Tests.hs
@@ -10,6 +10,7 @@
 import qualified Blaze.ByteString.Builder              as Builder
 import           Control.Applicative                   ((<$>))
 import           Control.Concurrent                    (forkIO)
+import           Control.Exception                     (try)
 import           Control.Monad                         (forM_, replicateM)
 import qualified Data.ByteString.Lazy                  as BL
 import           Data.List                             (intersperse)
@@ -37,7 +38,7 @@
 tests :: Test
 tests = testGroup "Network.WebSockets.Test"
     [ testProperty "simple encode/decode Hybi13" (testSimpleEncodeDecode Hybi13)
-    , testProperty "framgmented Hybi13"          testFragmentedHybi13
+    , testProperty "fragmented Hybi13"           testFragmentedHybi13
     ]
 
 
@@ -79,10 +80,12 @@
     isDataMessage (DataMessage _)    = True
 
     parseAll parse = do
-        mbMsg <- parse
+        mbMsg <- try parse
         case mbMsg of
-            Just msg -> (msg :) <$> parseAll parse
-            Nothing  -> return []
+            Left  ConnectionClosed -> return []
+            Left  _                -> return []
+            Right (Just msg)       -> (msg :) <$> parseAll parse
+            Right Nothing          -> return []
 
 
 --------------------------------------------------------------------------------
diff --git a/websockets.cabal b/websockets.cabal
--- a/websockets.cabal
+++ b/websockets.cabal
@@ -1,5 +1,5 @@
 Name:    websockets
-Version: 0.9.6.0
+Version: 0.9.6.1
 
 Synopsis:
   A sensible and clean way to write WebSocket-capable servers in Haskell.