diff --git a/servant-client/src/Servant/Common/BaseUrl.hs b/servant-client/src/Servant/Common/BaseUrl.hs
index 3862821d..f8cc61e2 100644
--- a/servant-client/src/Servant/Common/BaseUrl.hs
+++ b/servant-client/src/Servant/Common/BaseUrl.hs
@@ -1,5 +1,6 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE ViewPatterns #-}
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE DeriveGeneric      #-}
+{-# LANGUAGE ViewPatterns       #-}
 module Servant.Common.BaseUrl (
   -- * types
     BaseUrl (..)
@@ -12,6 +13,7 @@ module Servant.Common.BaseUrl (
 
 import Control.Monad.Catch (MonadThrow, throwM, Exception)
 import Data.List
+import Data.Typeable
 import GHC.Generics
 import Network.URI
 import Safe
@@ -43,7 +45,7 @@ showBaseUrl (BaseUrl urlscheme host port) =
         (Https, 443) -> ""
         _ -> ":" ++ show port
 
-newtype InvalidBaseUrlException = InvalidBaseUrlException { _getInvalidUrlException :: String } deriving Show
+data InvalidBaseUrlException = InvalidBaseUrlException String deriving (Show, Typeable)
 instance Exception InvalidBaseUrlException
 
 parseBaseUrl :: MonadThrow m => String -> m BaseUrl
diff --git a/servant-client/src/Servant/Common/Req.hs b/servant-client/src/Servant/Common/Req.hs
index 19d5ddce..ac2c3dba 100644
--- a/servant-client/src/Servant/Common/Req.hs
+++ b/servant-client/src/Servant/Common/Req.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE AutoDeriveTypeable  #-}
+{-# LANGUAGE DeriveDataTypeable  #-}
 {-# LANGUAGE CPP                 #-}
 {-# LANGUAGE OverloadedStrings   #-}
 {-# LANGUAGE ScopedTypeVariables #-}
@@ -19,6 +19,7 @@ import Data.String.Conversions
 import Data.Proxy
 import Data.Text (Text)
 import Data.Text.Encoding
+import Data.Typeable
 import Network.HTTP.Client hiding (Proxy)
 import Network.HTTP.Client.TLS
 import Network.HTTP.Media
@@ -54,7 +55,7 @@ data ServantError
     { responseContentTypeHeader :: ByteString
     , responseBody              :: ByteString
     }
-  deriving (Show)
+  deriving (Show, Typeable)
 
 instance Exception ServantError