1 files changed, 4 insertions, 2 deletions
diff --git a/app/presenters/label_presenter.rb b/app/presenters/label_presenter.rb
index fafade2828f..8d604f9a0f6 100644
--- a/app/presenters/label_presenter.rb
+++ b/app/presenters/label_presenter.rb
@@ -2,7 +2,7 @@
 
 class LabelPresenter < Gitlab::View::Presenter::Delegated
   presents ::Label, as: :label
-  delegate :name, :full_name, to: :label_subject, prefix: :subject
+  delegate :name, :full_name, to: :label_subject, prefix: :subject, allow_nil: true
 
   delegator_override :subject # TODO: Fix `Gitlab::View::Presenter::Delegated#subject` not to override `Label#subject`.
 
@@ -10,6 +10,7 @@ class LabelPresenter < Gitlab::View::Presenter::Delegated
     case label
     when GroupLabel then edit_group_label_path(label.group, label)
     when ProjectLabel then edit_project_label_path(label.project, label)
+    else edit_admin_label_path(label)
     end
   end
 
@@ -17,6 +18,7 @@ class LabelPresenter < Gitlab::View::Presenter::Delegated
     case label
     when GroupLabel then group_label_path(label.group, label)
     when ProjectLabel then project_label_path(label.project, label)
+    else admin_label_path(label)
     end
   end
 
@@ -43,7 +45,7 @@ class LabelPresenter < Gitlab::View::Presenter::Delegated
   end
 
   def label_subject
-    @label_subject ||= label.subject
+    @label_subject ||= label.subject if label.respond_to?(:subject)
   end
 
   private