diff --git a/hosting/views.py b/hosting/views.py
index 9d975df1..24da0ba9 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -663,7 +663,8 @@ class SettingsView(LoginRequiredMixin, FormView):
                             extra_tags='error'
                         )
                         billing_address = current_billing_address
-                        billing_address.save()
+                        if billing_address:
+                            billing_address.save()
                         email_data = {
                             'subject': "%s updated VAT number to %s but failed" %
                                        (request.user.email, vat_number),