diff --git a/endpoints/api.py b/endpoints/api.py
index 080deee58..00e405d15 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -1557,7 +1557,7 @@ def org_invoices_api(orgname):
       'attempted': i.attempted,
       'closed': i.closed,
       'total': i.total,
-      'plan': i.lines.data[0].plan.id
+      'plan': i.lines.data[0].plan.id if i.lines.data[0].plan else None
     }
     
   permission = AdministerOrganizationPermission(orgname)
diff --git a/static/partials/org-admin.html b/static/partials/org-admin.html
index 02e73abef..45360ec76 100644
--- a/static/partials/org-admin.html
+++ b/static/partials/org-admin.html
@@ -93,7 +93,7 @@
                       </dd>
                       <dt>Plan</dt>
                       <dd>
-                        <span>{{ plan_map[invoice.plan].title }}</span>
+                        <span>{{ invoice.plan ? plan_map[invoice.plan].title : '(N/A)' }}</span>
                       </dd>
                     </dl>
                   </td>