From 5c22c17c6e1f793f1c2afb207bdefce90f31ac61 Mon Sep 17 00:00:00 2001
From: Dave Hall <dave@etianen.com>
Date: Thu, 6 Nov 2014 10:58:20 +0000
Subject: [PATCH] Attempting to fix issues with resolving nullable foreign
 keys.

---
 .gitignore                 | 1 +
 src/watson/registration.py | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2eefb77..75eb18b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ Thumbs.db
 /MANIFEST
 /dist
 *.sqlite3
+*.egg-info
diff --git a/src/watson/registration.py b/src/watson/registration.py
index bdab31d..275fe9f 100644
--- a/src/watson/registration.py
+++ b/src/watson/registration.py
@@ -50,7 +50,9 @@ class SearchAdapter(object):
         name_parts = name.split("__", 1)
         prefix = name_parts[0]
         # Get the attribute.
-        if hasattr(obj, prefix):
+        if obj is None:
+            return ""
+        elif hasattr(obj, prefix):
             value = getattr(obj, prefix)
             if not isinstance(value, (QuerySet, models.Manager)):
                 if callable(value):