2 files changed, 14 insertions, 4 deletions

diff --git a/TraversableT.hs b/TraversableT.hs
index 98a97bf6..cc187951 100644
--- a/TraversableT.hs
+++ b/TraversableT.hs
@@ -4,7 +4,7 @@ import Data.Traversable
 import Control.Monad (join,MonadPlus(..))
 import Control.Monad.Trans.Class
 import Control.Applicative
-import Data.Foldable (Foldable(foldMap))
+import Data.Foldable (Foldable(foldMap), toList)
 import Data.Maybe (maybeToList)
 
 -- | 
@@ -82,3 +82,13 @@ liftMaybe = liftT . maybeToList
 liftIOMaybe :: IO (Maybe a) -> TraversableT [] IO a
 liftIOMaybe = liftMT . fmap maybeToList
 
+handleT :: ( Monad m
+           , Traversable t ) =>
+        (t a -> TraversableT t m a)
+        -> TraversableT t m a
+        -> TraversableT t m a
+handleT catcher body = TraversableT $ do
+    tx <- runTraversableT body
+    if null (toList tx)
+        then runTraversableT $ catcher tx
+        else return tx
diff --git a/presence.cabal b/presence.cabal
index a54213bb..cbf857f7 100644
--- a/presence.cabal
+++ b/presence.cabal
@@ -16,10 +16,10 @@ data-dir: ""
 executable presence
     build-depends: base -any, stm -any, text (>=0.11.2.0), xml-types -any, containers -any,
                    network -any, time -any, transformers -any, resourcet -any, bytestring -any,
-                   mtl -any, mmorph -any, conduit (>=1.0.4), xml-conduit -any, void -any, random -any,
-                   data-default -any, blaze-builder-conduit -any, blaze-builder -any, unix -any,
+                   mtl -any, mmorph -any, conduit (>=1.0.4), void -any, random -any,
+                   data-default -any, blaze-builder -any, unix -any, conduit-extra -any,
                    binary -any, directory -any, cpu -any, template-haskell -any, deepseq -any,
-                   filepath -any, hinotify -any, process -any
+                   filepath -any, hinotify -any, process -any, xml-conduit -any
     main-is: xmppServer.hs
     buildable: True
     cpp-options: -DRENDERFLUSH