diff --git a/lib/token_manager.rb b/lib/token_manager.rb
index 8b75ad0e8c6..9d6970c65df 100644
--- a/lib/token_manager.rb
+++ b/lib/token_manager.rb
@@ -37,7 +37,10 @@ def reset_token(token)
   def token_get_info(token, what = nil)
     return {} unless token_valid?(token)
 
-    what.nil? ? token_store.read(token) : token_store.read(token)[what]
+    token_data = token_store.read(token)
+    return nil if token_data.nil?
+
+    what.nil? ? token_data : token_data[what]
   end
 
   def token_valid?(token)