diff --git a/bt/views.py b/bt/views.py
index a2239383443aa8c573efd402512f8b0e03a6c29b..c05a86a5ec0ddce33a22d7e6675e63c691d0783d 100644
--- a/bt/views.py
+++ b/bt/views.py
@@ -97,10 +97,12 @@ def confirm(request, id, name=None):
                 return HttpResponse(unicode(_("Thank you, this has been already confirmed")))
             c.save()
         return HttpResponse('<div class="confirm_thanks">%s</div>' % unicode(_('Thank you for your confirmation')) )
-    c=Confirmation.objects.get(key=id)
-    if c:
-        c.key=''
-        c.save()
+    try:
+        c = get_object_or_404(Confirmation, key=id)
+    except:
+        return HttpResponse(unicode(_("Thank you, this has been already confirmed")))
+    c.key=''
+    c.save()
     messages.add_message(request, messages.INFO, unicode(_('Thank you for verifying your confirmation')))
     return HttpResponseRedirect('/') # Redirect after POST