From e2e3065cfb11ddf094c899a4a9ea71ae5fa67fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= <romjerome@yahoo.fr>
Date: Wed, 5 May 2010 11:47:18 +0000
Subject: [PATCH] merge fix on branch rev15295

svn: r15327
---
 src/gen/proxy/proxybase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gen/proxy/proxybase.py b/src/gen/proxy/proxybase.py
index c1f19775c..0a7e188d0 100644
--- a/src/gen/proxy/proxybase.py
+++ b/src/gen/proxy/proxybase.py
@@ -306,7 +306,7 @@ class ProxyDbBase(DbReadBase):
         """
         Returns obj if predicate is True or not callable, else returns None
         """
-        if predicate is not None:
+        if predicate is not None and obj is not None:
             return obj if predicate(obj.handle) else None
         return obj