diff --git a/src/bwpass.py b/src/bwpass.py
index 752d823..01adfcf 100644
--- a/src/bwpass.py
+++ b/src/bwpass.py
@@ -36,6 +36,10 @@ class BitwardenError(Exception):
     pass
 
 
+class LockedVaultError(BitwardenError):
+    pass
+
+
 class PinentryError(Exception):
     pass
 
@@ -133,7 +137,12 @@ class Vault:
                 self.load_cache()
                 return self
         self.unlock()
-        self.get_items()
+        try:
+            self.get_items()
+        except LockedVaultError:
+            self.lock()
+            self.unlock()
+            self.get_items()
         return self
 
     def get_items(self):
@@ -161,6 +170,18 @@ class Vault:
         with open(self.cache) as f:
             self.items = json.load(f)
 
+    def lock(self) -> None:
+        uid = os.getuid()
+        fn = os.path.join(
+            tempfile.gettempdir(),
+            f'.bw_session-{uid}',
+        )
+        try:
+            os.unlink(fn)
+        except FileNotFoundError:
+            pass
+        self.session_id = None
+
     def unlock(self) -> None:
         uid = os.getuid()
         fn = os.path.join(
@@ -215,7 +236,11 @@ class Vault:
         )
         data = p.communicate(stdin_bytes)[0].decode('utf-8')
         if p.returncode != 0:
-            raise BitwardenError(data.rstrip('\n'))
+            msg = data.rstrip('\n')
+            if msg == 'Vault is locked.':
+                raise LockedVaultError(msg)
+            else:
+                raise BitwardenError(msg)
         return data