diff --git a/endpoints/api.py b/endpoints/api.py
index a550a58cf..b44aa03eb 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -401,7 +401,9 @@ def get_subscription():
   if user.stripe_id:
     private_repos = model.get_private_repo_count(user.username)
     cus = stripe.Customer.retrieve(user.stripe_id)
-    return jsonify(subscription_view(cus.subscription, private_repos))
+
+    if cus.subscription:
+      return jsonify(subscription_view(cus.subscription, private_repos))
 
   abort(404)