diff --git a/src/sshecret/api.py b/src/sshecret/api.py
index 494de1e..8f577c1 100644
--- a/src/sshecret/api.py
+++ b/src/sshecret/api.py
@@ -9,7 +9,6 @@ import abc
 from contextlib import contextmanager
 from collections.abc import Iterator
 
-from click import password_option
 from pydantic.networks import IPvAnyAddress, IPvAnyNetwork
 
 from .audit import audit_message
@@ -218,6 +217,8 @@ class ClientManagementAPI(BaseSshecretAPI):
                     secret_name=name,
                     source_address=self.api_client.source,
                 )
+                if not secret:
+                    raise RuntimeError("Could not fetch a new secret value.")
                 new_value = encrypt_string(secret, client_key)
                 secrets[name] = new_value
 
diff --git a/src/sshecret/webapi/api.py b/src/sshecret/webapi/api.py
index 8f9d304..7a25d72 100644
--- a/src/sshecret/webapi/api.py
+++ b/src/sshecret/webapi/api.py
@@ -1,8 +1,8 @@
 """WebAPI."""
 
 import asyncio
-from functools import lru_cache
 import logging
+from functools import lru_cache
 import secrets
 import time