diff --git a/hggit/__init__.py b/hggit/__init__.py
index 8b51b82cfb4840e87ef0a90314c549b62d8e43c1_aGdnaXQvX19pbml0X18ucHk=..d6ac1ae9027a438a4cad5174c7236a2335243774_aGdnaXQvX19pbml0X18ucHk= 100644
--- a/hggit/__init__.py
+++ b/hggit/__init__.py
@@ -442,6 +442,8 @@
 
 
 def _gitnodekw(node, repo):
+    if not hasattr(repo, 'githandler'):
+        return None
     gitnode = repo.githandler.map_git_get(node.hex())
     if gitnode is None:
         gitnode = b''
diff --git a/hggit/overlay.py b/hggit/overlay.py
index 8b51b82cfb4840e87ef0a90314c549b62d8e43c1_aGdnaXQvb3ZlcmxheS5weQ==..d6ac1ae9027a438a4cad5174c7236a2335243774_aGdnaXQvb3ZlcmxheS5weQ== 100644
--- a/hggit/overlay.py
+++ b/hggit/overlay.py
@@ -441,6 +441,7 @@
 class overlayrepo(object):
     def __init__(self, handler, commits, refs):
         self.handler = handler
+        self._activebookmark = None
 
         self.changelog = overlaychangelog(self, handler.repo.changelog)
         if util.safehasattr(handler.repo, b'manifest'):