1 files changed, 14 insertions, 4 deletions
diff --git a/lib/gitlab/data_builder/deployment.rb b/lib/gitlab/data_builder/deployment.rb
index a4508bc93c5..0e6841e10a7 100644
--- a/lib/gitlab/data_builder/deployment.rb
+++ b/lib/gitlab/data_builder/deployment.rb
@@ -12,6 +12,16 @@ module Gitlab
             Gitlab::UrlBuilder.build(deployment.deployable)
           end
 
+        commit_url =
+          if (commit = deployment.commit)
+            Gitlab::UrlBuilder.build(commit)
+          end
+
+        user_url =
+          if deployment.deployed_by
+            Gitlab::UrlBuilder.build(deployment.deployed_by)
+          end
+
         {
           object_kind: 'deployment',
           status: deployment.status,
@@ -22,10 +32,10 @@ module Gitlab
           environment: deployment.environment.name,
           project: deployment.project.hook_attrs,
           short_sha: deployment.short_sha,
-          user: deployment.deployed_by.hook_attrs,
-          user_url: Gitlab::UrlBuilder.build(deployment.deployed_by),
-          commit_url: Gitlab::UrlBuilder.build(deployment.commit),
-          commit_title: deployment.commit.title,
+          user: deployment.deployed_by&.hook_attrs,
+          user_url: user_url,
+          commit_url: commit_url,
+          commit_title: deployment.commit_title,
           ref: deployment.ref
         }
       end