1 files changed, 3 insertions, 2 deletions

diff --git a/src/Data/BEncode.hs b/src/Data/BEncode.hs
index 4a80e47..80f0108 100644
--- a/src/Data/BEncode.hs
+++ b/src/Data/BEncode.hs
@@ -68,7 +68,7 @@ class BEncodable a where
 --  bencoding = Iso (Right . toBencode) fromBEncode
 
 decodingError :: String -> Result a
-decodingError s = Left ("fromBEncode: unable to match " ++ s)
+decodingError s = Left ("fromBEncode: unable to decode " ++ s)
 {-# INLINE decodingError #-}
 
 instance BEncodable BEncode where
@@ -182,7 +182,8 @@ reqKey d key
 
 optKey :: BEncodable a => Map ByteString BEncode -> ByteString -> Result (Maybe a)
 optKey d key
-  | Just b <- M.lookup key d = Just <$> fromBEncode b
+  | Just b <- M.lookup key d
+  , Right r <- fromBEncode b = return (Just r)
   | otherwise                = return Nothing
 
 (>--) :: BEncodable a => Map ByteString BEncode -> ByteString -> Result a