1 files changed, 8 insertions, 3 deletions

diff --git a/lib/d2/app/adapters/detail.py b/lib/d2/app/adapters/detail.py
index 738230b..ba2906d 100644
--- a/lib/d2/app/adapters/detail.py
+++ b/lib/d2/app/adapters/detail.py
@@ -351,10 +351,11 @@ class DetailAdapter(BaseAdapter):
     def details(self, plot_id=None, occupant_id=None):
         """ Returns a named tuple with complete details.
         """
-        plot_id, occupant_id = self._validate(plot_id, occupant_id)
-        plot = self.details_to_dict(self.fetch_all_plot_details(plot_id))
+        (plot_id_, occupant_id_) = self._validate(plot_id, occupant_id)
+
+        plot = self.details_to_dict(self.fetch_all_plot_details(plot_id_))
         occupant = self.details_to_dict(self.fetch_all_occupant_details(
-                                occupant_id))
+                                occupant_id_))
 
         if plot and occupant:
             occupant[u'plot_id'] = plot[u'plot_id']
@@ -368,6 +369,7 @@ class DetailAdapter(BaseAdapter):
 
             for key, val in plot.items():
                 occupant[key] = val
+
             return self._details_dict_to_tuple(occupant)
 
         if plot:
@@ -376,6 +378,9 @@ class DetailAdapter(BaseAdapter):
         if occupant:
             return self._details_dict_to_tuple(occupant)
 
+        make_ = namedtuple("Detail", "label plot_id occupant_id")
+        return make_(None, None, None)
+
     def _validate(self, plot_id, occupant_id, start_date=None):
         """Validates that the given plot_id and occupant_id
         are valid.  Also checks forge