diff --git a/core/src/main/java/hudson/cli/SetBuildDisplayNameCommand.java b/core/src/main/java/hudson/cli/SetBuildDisplayNameCommand.java
index 5233cf7f7f5f408a685bb93bf1fb61f7a11befbb..08b08b7d7166b510e545d598cfddbad85c299ad7 100644
--- a/core/src/main/java/hudson/cli/SetBuildDisplayNameCommand.java
+++ b/core/src/main/java/hudson/cli/SetBuildDisplayNameCommand.java
@@ -3,15 +3,14 @@ package hudson.cli;
 import hudson.Extension;
 import hudson.model.AbstractProject;
 import hudson.model.Run;
-import hudson.remoting.Callable;
 import org.apache.commons.io.IOUtils;
 import org.kohsuke.args4j.Argument;
 
-import java.io.IOException;
 import java.io.Serializable;
 
 @Extension
 public class SetBuildDisplayNameCommand extends CLICommand implements Serializable {
+    private static final long serialVersionUID = 6665171784136358536L;
 
     @Override
     public String getShortDescription() {
@@ -27,8 +26,13 @@ public class SetBuildDisplayNameCommand extends CLICommand implements Serializab
     @Argument(metaVar="DISPLAYNAME", required=true, usage="DisplayName to be set. '-' to read from stdin.", index=2)
     public String displayName;
 
+    @Override
     protected int run() throws Exception {
-        Run run = job.getBuildByNumber(number);
+        Run<?, ?> run = job.getBuildByNumber(number);
+        if (run == null) {
+            stderr.format("Build #%d does not exist\n", number);
+            return -1;
+        }
         run.checkPermission(Run.UPDATE);
 
         if ("-".equals(displayName)) {
@@ -39,5 +43,4 @@ public class SetBuildDisplayNameCommand extends CLICommand implements Serializab
 
         return 0;
     }
-
 }
diff --git a/test/src/test/java/hudson/cli/SetBuildDisplayNameCommandTest.java b/test/src/test/java/hudson/cli/SetBuildDisplayNameCommandTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..3633c56a2d14511558465b0ceb62a83ce4a42e2f
--- /dev/null
+++ b/test/src/test/java/hudson/cli/SetBuildDisplayNameCommandTest.java
@@ -0,0 +1,77 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2013 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package hudson.cli;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.text.IsEmptyString.isEmptyString;
+import hudson.model.FreeStyleBuild;
+import hudson.model.FreeStyleProject;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+
+public class SetBuildDisplayNameCommandTest {
+
+    private CLICommandInvoker command;
+
+    @Rule public final JenkinsRule j = new JenkinsRule();
+
+    @Before public void setUp() {
+
+        command = new CLICommandInvoker(j, new SetBuildDisplayNameCommand());
+    }
+
+    @Test public void referencingBuildThatDoesNotExistsShouldFail() throws Exception {
+
+        j.createFreeStyleProject("project");
+
+        final CLICommandInvoker.Result result = command
+                .invokeWithArgs("project", "42", "DisplayName")
+        ;
+
+        assertThat(result.stderr(), containsString("Build #42 does not exist"));
+        assertThat("No output expected", result.stdout(), isEmptyString());
+        assertThat("Command is expected to fail", result.returnCode(), equalTo(-1));
+    }
+
+    @Test public void setDescriptionSuccesfully() throws Exception {
+
+        FreeStyleProject job = j.createFreeStyleProject("project");
+        FreeStyleBuild build = job.scheduleBuild2(0).get();
+
+        final CLICommandInvoker.Result result = command
+                .invokeWithArgs("project", "1", "DisplayName")
+        ;
+
+        assertThat("No output expected", result.stdout(), isEmptyString());
+        assertThat("No error output expected", result.stderr(), isEmptyString());
+        assertThat("Command is expected to succeed", result.returnCode(), equalTo(0));
+        assertThat(build.getDisplayName(), equalTo("DisplayName"));
+    }
+}