From a77aeaaef99af54fa4670325d78c58ae37b3e238 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <jschorr@gmail.com>
Date: Mon, 2 Dec 2013 13:50:51 -0500
Subject: [PATCH] Performer will sometimes by None

---
 endpoints/api.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/endpoints/api.py b/endpoints/api.py
index ef733e4ea..8afc2bb9f 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -1692,17 +1692,21 @@ def delete_org_robot(orgname, robot_shortname):
 @api_login_required
 def org_logs_api(orgname):
   def log_view(log):
-    return {
+    view = {
       'kind': log.kind.name,
       'metadata': json.loads(log.metadata_json),
-      'ip': log.ip,
-      'performer': {
-        'username': log.performer.username,
-        'is_robot': log.performer.robot,
-      },
+      'ip': log.ip,      
       'datetime': log.datetime,
     }
 
+    if log.performer:
+      view['performer'] = {
+        'username': log.performer.username,
+        'is_robot': log.performer.robot,
+      }
+
+    return view
+
   permission = AdministerOrganizationPermission(orgname)
   if permission.can():
     logs = model.list_logs(orgname)