4 files changed, 14 insertions, 7 deletions

diff --git a/OnionRouter.hs b/OnionRouter.hs
index b11a0bf6..f1b0b41c 100644
--- a/OnionRouter.hs
+++ b/OnionRouter.hs
@@ -286,7 +286,9 @@ handleEvent getnodes or e@(BuildRoute (RouteId rid)) = do
         ts <- selectTrampolines or
         join . atomically $ do
         drg <- readTVar (onionDRG or)
-        [av,bv,cv] <- sequence $ replicate 3 (newTVar Nothing)
+        av <- newTVar Nothing
+        bv <- newTVar Nothing
+        cv <- newTVar Nothing
         let (getr, drg') = withDRG drg $ do
                 asec <- generateSecretKey -- Three aliases
                 bsec <- generateSecretKey
diff --git a/src/Crypto/Tox.hs b/src/Crypto/Tox.hs
index 61a392e2..9b097c7e 100644
--- a/src/Crypto/Tox.hs
+++ b/src/Crypto/Tox.hs
@@ -470,8 +470,9 @@ instance Read Nonce32 where
                 '=':xs -> Right xs -- optional terminating '='
                 _      -> Right ss
         bs <- Base64.decode (C8.pack $ ds ++ ['='])
-        guard $ B.length bs == 32
-        return [ (Nonce32 bs, ss') ]
+        if B.length bs == 32
+            then Right [ (Nonce32 bs, ss') ]
+            else Left "Insuffiicent base64 digits while parsing Nonce32."
 
 instance Serialize Nonce32 where
     get = Nonce32 <$> getBytes 32
diff --git a/src/Network/Tox/AggregateSession.hs b/src/Network/Tox/AggregateSession.hs
index 513896cc..df16dc4e 100644
--- a/src/Network/Tox/AggregateSession.hs
+++ b/src/Network/Tox/AggregateSession.hs
@@ -155,9 +155,12 @@ keepAlive s q = do
 
     now <- getPOSIXTime
     join $ atomically $ do
-        Just ( k :-> tm ) <- PSQ.findMin <$> readTVar q
-        return $ if now < tm then threadDelay (toMicroseconds $ tm - now) >> again
-                             else doEvent again now (toEnum k)
+        PSQ.findMin <$> readTVar q >>= \case
+          Nothing           -> error "keepAlive: unexpected empty PSQ."
+          Just ( k :-> tm ) ->
+            return $ if now < tm then threadDelay (toMicroseconds $ tm - now) >> again
+                                 else doEvent again now (toEnum k)
+
 
 -- | This function forks two threads: the 'keepAlive' beacon-sending thread and
 -- a thread to read all packets from the provided 'Session' and forward them to
diff --git a/src/Network/Tox/NodeId.hs b/src/Network/Tox/NodeId.hs
index d5da692a..dc600db7 100644
--- a/src/Network/Tox/NodeId.hs
+++ b/src/Network/Tox/NodeId.hs
@@ -589,7 +589,8 @@ parseNoSpamJID jid = do
 
 solveBase64NoSpamID :: String -> PublicKey -> Either String NoSpamId
 solveBase64NoSpamID b64digits pub = do
-    NoSpam nospam (Just x) <- readEither $ '$' : map (\case; '?' -> '0'; c -> c) b64digits
+    NoSpam nospam mx <- readEither $ '$' : map (\case; '?' -> '0'; c -> c) b64digits
+    maybe (const $ Left "missing checksum") (flip ($)) mx $ \x -> do
     let nlo = fromIntegral (0x0FFFF .&. nospam) :: Word16
         nhi = fromIntegral (0x0FFFF .&. (nospam `shiftR` 16)) :: Word16
         sum = x `xor` nlo `xor` nhi `xor` xorsum pub