diff --git a/src/CognitoClient.php b/src/CognitoClient.php
index f99348e..8f3b284 100644
--- a/src/CognitoClient.php
+++ b/src/CognitoClient.php
@@ -11,6 +11,7 @@
 use Jose\Component\Signature\JWSVerifier;
 use Jose\Component\Signature\Serializer\CompactSerializer;
 use pmill\AwsCognito\Exception\ChallengeException;
+use pmill\AwsCognito\Exception\CognitoResponseException;
 use pmill\AwsCognito\Exception\TokenExpiryException;
 use pmill\AwsCognito\Exception\TokenVerificationException;
 
@@ -82,13 +83,7 @@ public function authenticate($username, $password)
 
             return $this->handleAuthenticateResponse($response->toArray());
         } catch (CognitoIdentityProviderException $e) {
-            $errorClass = "pmill\\AwsCognito\\Exception\\" . $e->getAwsErrorCode();
-
-            if (class_exists($errorClass)) {
-                throw new $errorClass($e);
-            } else {
-                throw $e;
-            }
+            throw CognitoResponseException::createFromCognitoException($e);
         }
     }
 
@@ -103,14 +98,18 @@ public function authenticate($username, $password)
      */
     public function respondToAuthChallenge($challengeName, array $challengeResponses, $session)
     {
-        $response = $this->client->respondToAuthChallenge([
-            'ChallengeName' => $challengeName,
-            'ChallengeResponses' => $challengeResponses,
-            'ClientId' => $this->appClientId,
-            'Session' => $session,
-        ]);
+        try {
+            $response = $this->client->respondToAuthChallenge([
+                'ChallengeName' => $challengeName,
+                'ChallengeResponses' => $challengeResponses,
+                'ClientId' => $this->appClientId,
+                'Session' => $session,
+            ]);
 
-        return $this->handleAuthenticateResponse($response->toArray());
+            return $this->handleAuthenticateResponse($response->toArray());
+        } catch (CognitoIdentityProviderException $e) {
+            throw CognitoResponseException::createFromCognitoException($e);
+        }
     }
 
     /**
@@ -137,65 +136,88 @@ public function respondToNewPasswordRequiredChallenge($username, $newPassword, $
     /**
      * @param string $username
      * @param string $refreshToken
-     *
-     * @return array
+     * @return string
+     * @throws Exception
      */
     public function refreshAuthentication($username, $refreshToken)
     {
-        $response = $this->client->adminInitiateAuth([
-            'AuthFlow' => 'REFRESH_TOKEN_AUTH',
-            'AuthParameters' => [
-                'USERNAME' => $username,
-                'REFRESH_TOKEN' => $refreshToken,
-                'SECRET_HASH' => $this->cognitoSecretHash($username),
-            ],
-            'ClientId' => $this->appClientId,
-            'UserPoolId' => $this->userPoolId,
-        ])->toArray();
+        try {
+            $response = $this->client->adminInitiateAuth([
+                'AuthFlow' => 'REFRESH_TOKEN_AUTH',
+                'AuthParameters' => [
+                    'USERNAME' => $username,
+                    'REFRESH_TOKEN' => $refreshToken,
+                    'SECRET_HASH' => $this->cognitoSecretHash($username),
+                ],
+                'ClientId' => $this->appClientId,
+                'UserPoolId' => $this->userPoolId,
+            ])->toArray();
 
-        return $response['AuthenticationResult'];
+            return $response['AuthenticationResult'];
+        } catch (CognitoIdentityProviderException $e) {
+            throw CognitoResponseException::createFromCognitoException($e);
+        }
     }
 
     /**
      * @param string $accessToken
      * @param string $previousPassword
      * @param string $proposedPassword
+     * @throws Exception
+     * @throws TokenExpiryException
+     * @throws TokenVerificationException
      */
     public function changePassword($accessToken, $previousPassword, $proposedPassword)
     {
         $this->verifyAccessToken($accessToken);
 
-        $this->client->changePassword([
-            'AccessToken' => $accessToken,
-            'PreviousPassword' => $previousPassword,
-            'ProposedPassword' => $proposedPassword,
-        ]);
+        try {
+            $this->client->changePassword([
+                'AccessToken' => $accessToken,
+                'PreviousPassword' => $previousPassword,
+                'ProposedPassword' => $proposedPassword,
+            ]);
+        } catch (CognitoIdentityProviderException $e) {
+            throw CognitoResponseException::createFromCognitoException($e);
+        }
     }
 
     /**
      * @param string $confirmationCode
      * @param string $username
+     * @throws Exception
      */
     public function confirmUserRegistration($confirmationCode, $username)
     {
-        $this->client->confirmSignUp([
-            'ClientId' => $this->appClientId,
-            'ConfirmationCode' => $confirmationCode,
-            'SecretHash' => $this->cognitoSecretHash($username),
-            'Username' => $username,
-        ]);
+        try {
+            $this->client->confirmSignUp([
+                'ClientId' => $this->appClientId,
+                'ConfirmationCode' => $confirmationCode,
+                'SecretHash' => $this->cognitoSecretHash($username),
+                'Username' => $username,
+            ]);
+        } catch (CognitoIdentityProviderException $e) {
+            throw CognitoResponseException::createFromCognitoException($e);
+        }
     }
 
     /**
      * @param string $accessToken
+     * @throws Exception
+     * @throws TokenExpiryException
+     * @throws TokenVerificationException
      */
     public function deleteUser($accessToken)
     {
         $this->verifyAccessToken($accessToken);
 
-        $this->client->deleteUser([
-            'AccessToken' => $accessToken,
-        ]);
+        try {
+            $this->client->deleteUser([
+                'AccessToken' => $accessToken,
+            ]);
+        } catch (CognitoIdentityProviderException $e) {
+            throw CognitoResponseException::createFromCognitoException($e);
+        }
     }
 
     /**
@@ -237,8 +259,8 @@ protected function downloadJwtWebKeys()
      * @param string $username
      * @param string $password
      * @param array $attributes
-     *
      * @return string
+     * @throws Exception
      */
     public function registerUser($username, $password, array $attributes = [])
     {
@@ -250,55 +272,74 @@ public function registerUser($username, $password, array $attributes = [])
             ];
         }
 
-        $response = $this->client->signUp([
-            'ClientId' => $this->appClientId,
-            'Password' => $password,
-            'SecretHash' => $this->cognitoSecretHash($username),
-            'UserAttributes' => $userAttributes,
-            'Username' => $username,
-        ]);
+        try {
+            $response = $this->client->signUp([
+                'ClientId' => $this->appClientId,
+                'Password' => $password,
+                'SecretHash' => $this->cognitoSecretHash($username),
+                'UserAttributes' => $userAttributes,
+                'Username' => $username,
+            ]);
 
-        return $response['UserSub'];
+            return $response['UserSub'];
+        } catch (CognitoIdentityProviderException $e) {
+            throw CognitoResponseException::createFromCognitoException($e);
+        }
     }
 
     /**
      * @param string $confirmationCode
      * @param string $username
      * @param string $proposedPassword
+     * @throws Exception
      */
     public function resetPassword($confirmationCode, $username, $proposedPassword)
     {
-        $this->client->confirmForgotPassword([
-            'ClientId' => $this->appClientId,
-            'ConfirmationCode' => $confirmationCode,
-            'Password' => $proposedPassword,
-            'SecretHash' => $this->cognitoSecretHash($username),
-            'Username' => $username,
-        ]);
+        try {
+            $this->client->confirmForgotPassword([
+                'ClientId' => $this->appClientId,
+                'ConfirmationCode' => $confirmationCode,
+                'Password' => $proposedPassword,
+                'SecretHash' => $this->cognitoSecretHash($username),
+                'Username' => $username,
+            ]);
+        } catch (CognitoIdentityProviderException $e) {
+            throw CognitoResponseException::createFromCognitoException($e);
+        }
     }
 
     /**
      * @param string $username
+     * @throws Exception
      */
     public function resendRegistrationConfirmationCode($username)
     {
-        $this->client->resendConfirmationCode([
-            'ClientId' => $this->appClientId,
-            'SecretHash' => $this->cognitoSecretHash($username),
-            'Username' => $username,
-        ]);
+        try {
+            $this->client->resendConfirmationCode([
+                'ClientId' => $this->appClientId,
+                'SecretHash' => $this->cognitoSecretHash($username),
+                'Username' => $username,
+            ]);
+        } catch (CognitoIdentityProviderException $e) {
+            throw CognitoResponseException::createFromCognitoException($e);
+        }
     }
 
     /**
      * @param string $username
+     * @throws Exception
      */
     public function sendForgottenPasswordRequest($username)
     {
-        $this->client->forgotPassword([
-            'ClientId' => $this->appClientId,
-            'SecretHash' => $this->cognitoSecretHash($username),
-            'Username' => $username,
-        ]);
+        try {
+            $this->client->forgotPassword([
+                'ClientId' => $this->appClientId,
+                'SecretHash' => $this->cognitoSecretHash($username),
+                'Username' => $username,
+            ]);
+        } catch (CognitoIdentityProviderException $e) {
+            throw CognitoResponseException::createFromCognitoException($e);
+        }
     }
 
     /**
diff --git a/src/Exception/CognitoResponseException.php b/src/Exception/CognitoResponseException.php
index a2d887d..a3e9726 100644
--- a/src/Exception/CognitoResponseException.php
+++ b/src/Exception/CognitoResponseException.php
@@ -1,9 +1,11 @@
 <?php
 namespace pmill\AwsCognito\Exception;
 
+use Aws\CognitoIdentityProvider\Exception\CognitoIdentityProviderException;
+use Exception;
 use Throwable;
 
-class CognitoResponseException extends \Exception
+class CognitoResponseException extends Exception
 {
     /**
      * CognitoResponseException constructor.
@@ -13,4 +15,19 @@ public function __construct(Throwable $previous = null)
     {
         parent::__construct(get_class(), 0, $previous);
     }
+
+    /**
+     * @param CognitoIdentityProviderException $e
+     * @return Exception
+     */
+    public static function createFromCognitoException(CognitoIdentityProviderException $e)
+    {
+        $errorClass = "pmill\\AwsCognito\\Exception\\" . $e->getAwsErrorCode();
+
+        if (class_exists($errorClass)) {
+            return new $errorClass($e);
+        }
+
+        return $e;
+    }
 }