diff --git a/src/authentic2_beid/views.py b/src/authentic2_beid/views.py
index 6986c93..1d270ce 100644
--- a/src/authentic2_beid/views.py
+++ b/src/authentic2_beid/views.py
@@ -96,9 +96,10 @@ class BeIDRegistrationCompletionView(RegistrationCompletionView):
 
     def form_valid(self, form):
         ret = super(BeIDRegistrationCompletionView, self).form_valid(form)
-        cert = models.ClientCertificate(user=self.object)
-        cert.__dict__.update(self.request.session['ssl_info'])
-        cert.save()
+        if self.request.session.get('ssl_info'):
+            cert = models.ClientCertificate(user=self.object)
+            cert.__dict__.update(self.request.session['ssl_info'])
+            cert.save()
         return ret
 
 registration_completion = valid_token(BeIDRegistrationCompletionView.as_view())