diff --git a/modules/gdcvault/browser.py b/modules/gdcvault/browser.py
index 34708003..e154048c 100644
--- a/modules/gdcvault/browser.py
+++ b/modules/gdcvault/browser.py
@@ -81,7 +81,9 @@ class GDCVaultBrowser(BaseBrowser):
             raise BrowserIncorrectPassword()
 
     def close_session(self):
-        # XXX: only if is_logged? or was used?
+        if self.password is None or not self.is_logged():
+            return
+
         self.openurl('/logout', '')
 
     @id2url(GDCVaultVideo.id2url)