diff --git a/cloud/routes.py b/cloud/routes.py
index f701813..def1565 100644
--- a/cloud/routes.py
+++ b/cloud/routes.py
@@ -358,10 +358,14 @@ def billing():
             groups.append(group.name)
 
     store_user = store.fetch_subscription_info(user.email)
+    if store_user is None:
+        expiration_date = 'Unable to reach Blender Store to check'
+    else:
+        expiration_date = store_user['expiration_date'][:10]
 
     return render_template(
         'users/settings/billing.html',
-        store_user=store_user, groups=groups, title='billing')
+        expiration_date=expiration_date, groups=groups, title='billing')
 
 
 @blueprint.route('/terms-and-conditions')
diff --git a/src/templates/users/settings/billing.pug b/src/templates/users/settings/billing.pug
index c5d0129..58089a0 100644
--- a/src/templates/users/settings/billing.pug
+++ b/src/templates/users/settings/billing.pug
@@ -22,13 +22,13 @@ style(type='text/css').
 					|  Your subscription is active
 				h4 Thank you for supporting us!
 				hr
-				p Subscription expires on: <strong>{{ store_user['expiration_date'][:10] }}</strong>
+				p Subscription expires on: <strong>{{ expiration_date }}</strong>
 				| {% else %}
 				h3.subscription-missing
 					i.pi-info
 					a(href="{{renew_url}}") Your subscription can be renewed
 				hr
-				p.text-danger Subscription expired on: <strong>{{ store_user['expiration_date'][:10] }}</strong>
+				p.text-danger Subscription expired on: <strong>{{ expiration_date }}</strong>
 				p
 					a.btn.btn-success(href="{{renew_url}}") Renew now
 				| {% endif %}