diff --git a/ivatar/ivataraccount/test_views.py b/ivatar/ivataraccount/test_views.py
index aaf1994..150bf95 100644
--- a/ivatar/ivataraccount/test_views.py
+++ b/ivatar/ivataraccount/test_views.py
@@ -333,7 +333,7 @@ class Tester(TestCase):  # pylint: disable=too-many-public-methods
             'unable to import photo from Gravatar?')
         self.assertEqual(
             str(list(response.context[0]['messages'])[0]),
-            'Image successfully imported',
+            'Gravatar image successfully imported',
             'Importing gravatar photo did not work?')
         self.assertIsInstance(
             self.user.photo_set.first(),
@@ -1162,8 +1162,6 @@ class Tester(TestCase):  # pylint: disable=too-many-public-methods
         )
         url = '%s?%s' % (urlobj.path, urlobj.query)
         response = self.client.get(url, follow=False)
-        print(response)
-        print(response.content)
         self.assertRedirects(
             response=response,
             expected_url=default,
diff --git a/ivatar/ivataraccount/views.py b/ivatar/ivataraccount/views.py
index 51c0a86..2f5f733 100644
--- a/ivatar/ivataraccount/views.py
+++ b/ivatar/ivataraccount/views.py
@@ -276,7 +276,14 @@ class ImportPhotoView(SuccessMessageMixin, TemplateView):
         context['photos'] = []
         addr = None
         if 'email_id' in kwargs:
-            addr = ConfirmedEmail.objects.get(pk=kwargs['email_id']).email
+            try:
+                addr = ConfirmedEmail.objects.get(pk=kwargs['email_id']).email
+            except:
+                messages.error(
+                    self.request,
+                    _('Address does not exist'))
+                return context
+
         if 'email_addr' in kwargs:
             addr = kwargs['email_addr']
 
@@ -324,12 +331,11 @@ class ImportPhotoView(SuccessMessageMixin, TemplateView):
             addr = request.POST['email_addr']
 
         if email_id:
-            try:
-                email = ConfirmedEmail.objects.filter(
-                    id=email_id, user=request.user)
-                if email.count() > 0:
-                    addr = email.first().email
-            except ConfirmedEmail.DoesNotExist:  # pylint: disable=no-member
+            email = ConfirmedEmail.objects.filter(
+                id=email_id, user=request.user)
+            if email.count() > 0:
+                addr = email.first().email
+            else:
                 messages.error(
                     request,
                     _('Address does not exist'))