@@ -97,6 +97,9 @@ func (r *REST) Get(ctx kapi.Context, name string, opts runtime.Object) (runtime.

 	}

 	location, transport, err := pod.LogLocation(r.PodGetter, r.ConnectionInfo, ctx, buildPodName, logOpts)

 	if err != nil {

+		if errors.IsNotFound(err) {

+			return nil, errors.NewNotFound("pod", buildPodName)

+		}

 		return nil, errors.NewBadRequest(err.Error())

 	}

 	return &genericrest.LocationStreamer{

@@ -3,6 +3,7 @@ package cmd

 import (

 	"fmt"

 	"io"

+	"net/http"

 	"os"

 	"strings"

@@ -44,6 +45,15 @@ func NewCmdBuildLogs(fullName string, f *clientcmd.Factory, out io.Writer) *cobr

 					fmt.Fprintf(out, msg)

 					os.Exit(1)

 				}

+				if err.Status().Code == http.StatusNotFound {

+					switch err.Status().Details.Kind {

+					case "build":

+						fmt.Fprintf(out, "The build %s could not be found.  Therefore build logs cannot be retrieved.\n", err.Status().Details.Name)

+					case "pod":

+						fmt.Fprintf(out, "The pod %s for build %s could not be found.  Therefore build logs cannot be retrieved.\n", err.Status().Details.Name, args[0])

+					}

+					os.Exit(1)

+				}

 			}

 			cmdutil.CheckErr(err)

 		},