diff --git a/mayan/apps/metadata/tests/test_views.py b/mayan/apps/metadata/tests/test_views.py
index 85121b93d8..de62d3a8f6 100644
--- a/mayan/apps/metadata/tests/test_views.py
+++ b/mayan/apps/metadata/tests/test_views.py
@@ -48,7 +48,7 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase):
             'metadata:metadata_add', args=(self.document.pk,),
             data={'metadata_type': self.metadata_type.pk}
         )
-        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.status_code, 403)
 
         self.assertEqual(len(self.document.metadata.all()), 0)
 
@@ -151,7 +151,7 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase):
             'metadata:metadata_remove', args=(self.document.pk,),
         )
 
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 403)
 
         # Test post to metadata removal view
         response = self.post(
@@ -164,7 +164,7 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase):
             }, follow=True
         )
 
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 403)
 
         self.assertEqual(len(self.document.metadata.all()), 1)
 
diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py
index 260592cf46..8ffa38b17d 100644
--- a/mayan/apps/metadata/views.py
+++ b/mayan/apps/metadata/views.py
@@ -37,6 +37,8 @@ from .permissions import (
 def metadata_edit(request, document_id=None, document_id_list=None):
     if document_id:
         documents = Document.objects.filter(pk=document_id)
+        if not documents:
+            raise Document.DoesNotExist
     elif document_id_list:
         documents = Document.objects.select_related('metadata').filter(
             pk__in=document_id_list
@@ -53,7 +55,7 @@ def metadata_edit(request, document_id=None, document_id_list=None):
 
     if not documents:
         if document_id:
-            raise Http404
+            raise PermissionDenied
         else:
             messages.error(request, _('Must provide at least one document.'))
             return HttpResponseRedirect(
@@ -183,6 +185,8 @@ def metadata_multiple_edit(request):
 def metadata_add(request, document_id=None, document_id_list=None):
     if document_id:
         documents = Document.objects.filter(pk=document_id)
+        if not documents:
+            raise Document.DoesNotExist
     elif document_id_list:
         documents = Document.objects.select_related('document_type').filter(pk__in=document_id_list)
         if len(set([document.document_type.pk for document in documents])) > 1:
@@ -205,12 +209,15 @@ def metadata_add(request, document_id=None, document_id_list=None):
         )
 
     if not documents:
-        messages.error(request, _('Must provide at least one document.'))
-        return HttpResponseRedirect(
-            request.META.get(
-                'HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)
+        if document_id:
+            raise PermissionDenied
+        else:
+            messages.error(request, _('Must provide at least one document.'))
+            return HttpResponseRedirect(
+                request.META.get(
+                    'HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)
+                )
             )
-        )
 
     for document in documents:
         document.add_as_recent_document_for_user(request.user)
@@ -323,6 +330,8 @@ def metadata_multiple_add(request):
 def metadata_remove(request, document_id=None, document_id_list=None):
     if document_id:
         documents = Document.objects.filter(pk=document_id)
+        if not documents:
+            raise Document.DoesNotExist
     elif document_id_list:
         documents = Document.objects.select_related('metadata').filter(
             pk__in=document_id_list
@@ -339,7 +348,7 @@ def metadata_remove(request, document_id=None, document_id_list=None):
 
     if not documents:
         if document_id:
-            raise Http404
+            raise PermissionDenied
         else:
             messages.error(request, _('Must provide at least one document.'))
             return HttpResponseRedirect(