diff --git a/src/Tonatona/Google.hs b/src/Tonatona/Google.hs
--- a/src/Tonatona/Google.hs
+++ b/src/Tonatona/Google.hs
@@ -1,9 +1,10 @@
+{-# LANGUAGE CPP #-}
 module Tonatona.Google
   ( run
   , Dsl
   , DslBackend
   , Config
-  , ServantError
+  , ClientError
   , JWT
   , JWT.Scope(..)
   ) where
@@ -13,16 +14,24 @@
 import qualified Google.Client as Client
 import Google.JWT (JWT)
 import qualified Google.JWT as JWT
+#if MIN_VERSION_servant_client(0, 16, 0)
+import Servant.Client (ClientError)
+#else
 import Servant.Client (ServantError)
+#endif
 
 import Tonatona (HasConfig(..), HasParser(..))
 import TonaParser (Parser, (.||), argLong, envVar, requiredVal)
 import Tonatona.Google.Internal
 
+#if !MIN_VERSION_servant_client(0, 16, 0)
+type ClientError = ServantError
+#endif
+
 -- | Main function.
 run ::
      (HasConfig env Config)
-  => (ServantError -> RIO env a)
+  => (ClientError -> RIO env a)
   -- ^ Error handler
   -> [JWT.Scope]
   -> Dsl env a
diff --git a/tonatona-google-server-api.cabal b/tonatona-google-server-api.cabal
--- a/tonatona-google-server-api.cabal
+++ b/tonatona-google-server-api.cabal
@@ -2,10 +2,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: fac284c01945c3a251b077bc1427890da305f1b84622b19a42992d3bbd4dc8cb
+-- hash: 89da5c1a2cd48026794663fbbb2481a140325dfeb0d5efec8c8653372b7d0dc5
 
 name:           tonatona-google-server-api
-version:        0.1.1.0
+version:        0.1.2.0
 synopsis:       tonatona plugin for google-server-api
 description:    Tonatona plugin for [google-server-api](https://hackage.haskell.org/package/google-server-api). This package provides a tonatona plugin to use Google API for server to server applications.
 category:       Database, Library, Tonatona, Web