2 files changed, 8 insertions, 4 deletions

diff --git a/src/Network/BitTorrent/Tracker/RPC/UDP.hs b/src/Network/BitTorrent/Tracker/RPC/UDP.hs
index 24e96238..31b6b870 100644
--- a/src/Network/BitTorrent/Tracker/RPC/UDP.hs
+++ b/src/Network/BitTorrent/Tracker/RPC/UDP.hs
@@ -123,10 +123,14 @@ checkOptions Options {..} = do
     throwIO $ userError "optMinTimeout must be positive"
 
   unless (optMaxTimeout > 0) $ do
+    throwIO $ userError "optMaxTimeout must be positive"
+
+  unless (optMultiplier > 0) $ do
+    throwIO $ userError "optMultiplier must be positive"
+
+  unless (optMaxTimeout > optMinTimeout) $ do
     throwIO $ userError "optMaxTimeout must be greater than optMinTimeout"
 
-  unless (optMinTimeout > 0) $ do
-    throwIO $ userError "optMinTimeout must be positive"
 
 {-----------------------------------------------------------------------
 --  Manager state
diff --git a/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs b/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
index 1ec3bdb7..3a3dddf5 100644
--- a/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
+++ b/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
@@ -67,7 +67,7 @@ spec = parallel $ do
       let opts = def { optMinTimeout = 2, optMaxTimeout = 1 }
       newManager opts `shouldThrow` isSomeException
 
-    it "should throw exception on  optMultiplier" $ do
+    it "should throw exception on zero optMultiplier" $ do
       let opts = def { optMultiplier = 0 }
       newManager opts `shouldThrow` isSomeException
 
@@ -141,4 +141,4 @@ spec = parallel $ do
             it "should handle arbitrary intermixed concurrent queries" $ do
               withManager rpcOpts $ \ mgr -> do
                 _ <- mapConcurrently (\ _ -> scrape mgr trackerURI [def]) [1..rpcCount]
-                return ()
\ No newline at end of file
+                return ()