diff --git a/rhodecode/lib/vcs/utils/lazy.py b/rhodecode/lib/vcs/utils/lazy.py
--- a/rhodecode/lib/vcs/utils/lazy.py
+++ b/rhodecode/lib/vcs/utils/lazy.py
@@ -17,11 +17,12 @@ class LazyProperty(object):
 
     def __init__(self, func):
         self._func = func
+        self.__module__ = func.__module__
         self.__name__ = func.__name__
         self.__doc__ = func.__doc__
 
     def __get__(self, obj, klass=None):
         if obj is None:
-            return None
+            return self
         result = obj.__dict__[self.__name__] = self._func(obj)
         return result