@@ -83,6 +83,7 @@ func (c *BuildConfigController) HandleBuildConfig(bc *buildapi.BuildConfig) erro

 			return &ConfigControllerFatalError{err.Error()}

 		} else {

 			instantiateErr = fmt.Errorf("error instantiating Build from BuildConfig %s/%s: %v", bc.Namespace, bc.Name, err)

+			c.Recorder.Event(bc, kapi.EventTypeWarning, "BuildConfigInstantiateFailed", instantiateErr.Error())

 			utilruntime.HandleError(instantiateErr)

 		}

 		return instantiateErr

@@ -4,6 +4,8 @@ import (

 	"fmt"

 	"testing"

+	"k8s.io/kubernetes/pkg/client/record"

+

 	buildapi "github.com/openshift/origin/pkg/build/api"

 )

@@ -44,6 +46,7 @@ func TestHandleBuildConfig(t *testing.T) {

 		}

 		controller := &BuildConfigController{

 			BuildConfigInstantiator: instantiator,

+			Recorder:                &record.FakeRecorder{},

 		}

 		err := controller.HandleBuildConfig(tc.bc)

 		if err != nil {

@@ -227,6 +227,9 @@ func (g *BuildGenerator) Instantiate(ctx kapi.Context, request *buildapi.BuildRe

 	}

 	if err := g.updateImageTriggers(ctx, bc, request.From, request.TriggeredByImage); err != nil {

+		if _, ok := err.(errors.APIStatus); ok {

+			return nil, err

+		}

 		return nil, errors.NewInternalError(err)

 	}

@@ -573,10 +576,8 @@ func (g *BuildGenerator) resolveImageStreamReference(ctx kapi.Context, from kapi

 	case "ImageStreamImage":

 		imageStreamImage, err := g.Client.GetImageStreamImage(kapi.WithNamespace(ctx, namespace), from.Name)

 		if err != nil {

-			glog.V(2).Infof("Error ImageStreamReference %s in namespace %s: %v", from.Name, namespace, err)

-			if errors.IsNotFound(err) {

-				return "", err

-			}

+			err = resolveError(from.Kind, namespace, from.Name, err)

+			glog.V(2).Info(err)

 			return "", err

 		}

 		image := imageStreamImage.Image

@@ -585,10 +586,8 @@ func (g *BuildGenerator) resolveImageStreamReference(ctx kapi.Context, from kapi

 	case "ImageStreamTag":

 		imageStreamTag, err := g.Client.GetImageStreamTag(kapi.WithNamespace(ctx, namespace), from.Name)

 		if err != nil {

-			glog.V(2).Infof("Error resolving ImageStreamTag reference %s in namespace %s: %v", from.Name, namespace, err)

-			if errors.IsNotFound(err) {

-				return "", err

-			}

+			err = resolveError(from.Kind, namespace, from.Name, err)

+			glog.V(2).Info(err)

 			return "", err

 		}

 		image := imageStreamTag.Image

@@ -614,10 +613,8 @@ func (g *BuildGenerator) resolveImageStreamDockerRepository(ctx kapi.Context, fr

 	case "ImageStreamImage":

 		imageStreamImage, err := g.Client.GetImageStreamImage(kapi.WithNamespace(ctx, namespace), from.Name)

 		if err != nil {

-			glog.V(2).Infof("Error ImageStreamReference %s in namespace %s: %v", from.Name, namespace, err)

-			if errors.IsNotFound(err) {

-				return "", err

-			}

+			err = resolveError(from.Kind, namespace, from.Name, err)

+			glog.V(2).Info(err)

 			return "", err

 		}

 		image := imageStreamImage.Image

@@ -627,10 +624,8 @@ func (g *BuildGenerator) resolveImageStreamDockerRepository(ctx kapi.Context, fr

 		name := strings.Split(from.Name, ":")[0]

 		is, err := g.Client.GetImageStream(kapi.WithNamespace(ctx, namespace), name)

 		if err != nil {

-			glog.V(2).Infof("Error getting ImageStream %s/%s: %v", namespace, name, err)

-			if errors.IsNotFound(err) {

-				return "", err

-			}

+			err = resolveError("ImageStream", namespace, from.Name, err)

+			glog.V(2).Info(err)

 			return "", err

 		}

 		image, err := imageapi.DockerImageReferenceForStream(is)

@@ -674,6 +669,24 @@ func (g *BuildGenerator) resolveImageSecret(ctx kapi.Context, secrets []kapi.Sec

 	return nil

 }

+func resolveError(kind string, namespace string, name string, err error) error {

+	msg := fmt.Sprintf("Error resolving %s %s in namespace %s: %v", kind, name, namespace, err)

+	return &errors.StatusError{unversioned.Status{

+		Status:  unversioned.StatusFailure,

+		Code:    errors.StatusUnprocessableEntity,

+		Reason:  unversioned.StatusReasonInvalid,

+		Message: msg,

+		Details: &unversioned.StatusDetails{

+			Kind: kind,

+			Name: name,

+			Causes: []unversioned.StatusCause{{

+				Field:   "from",

+				Message: msg,

+			}},

+		},

+	}}

+}

+

 // getNextBuildName returns name of the next build and increments BuildConfig's LastVersion.

 func getNextBuildName(buildConfig *buildapi.BuildConfig) string {

 	buildConfig.Status.LastVersion++

@@ -8,6 +8,7 @@ import (

 	"testing"

 	kapi "k8s.io/kubernetes/pkg/api"

+	"k8s.io/kubernetes/pkg/api/errors"

 	"k8s.io/kubernetes/pkg/api/resource"

 	"k8s.io/kubernetes/pkg/client/unversioned/testclient"

@@ -443,6 +444,30 @@ func TestInstantiateWithLastVersion(t *testing.T) {

 	}

 }

+func TestInstantiateWithMissingImageStream(t *testing.T) {

+	g := mockBuildGenerator()

+	c := g.Client.(Client)

+	c.GetImageStreamTagFunc = func(ctx kapi.Context, name string) (*imageapi.ImageStreamTag, error) {

+		return nil, errors.NewNotFound(imageapi.Resource("imagestreamtags"), "testRepo")

+	}

+	g.Client = c

+

+	_, err := g.Instantiate(kapi.NewDefaultContext(), &buildapi.BuildRequest{})

+	se, ok := err.(*errors.StatusError)

+

+	if !ok {

+		t.Errorf("Expected errors.StatusError, got %T", err)

+	}

+

+	if se.ErrStatus.Code != errors.StatusUnprocessableEntity {

+		t.Errorf("Expected status 422, got %d", se.ErrStatus.Code)

+	}

+

+	if !strings.Contains(se.ErrStatus.Message, "testns") {

+		t.Errorf("Error message does not contain namespace: %q", se.ErrStatus.Message)

+	}

+}

+

 func TestInstantiateWithLabelsAndAnnotations(t *testing.T) {

 	g := mockBuildGenerator()

 	c := g.Client.(Client)

@@ -38,7 +38,7 @@ import (

 func describerMap(c *client.Client, kclient kclient.Interface, host string) map[unversioned.GroupKind]kctl.Describer {

 	m := map[unversioned.GroupKind]kctl.Describer{

 		buildapi.Kind("Build"):                        &BuildDescriber{c, kclient},

-		buildapi.Kind("BuildConfig"):                  &BuildConfigDescriber{c, host},

+		buildapi.Kind("BuildConfig"):                  &BuildConfigDescriber{c, kclient, host},

 		deployapi.Kind("DeploymentConfig"):            &DeploymentConfigDescriber{c, kclient, nil},

 		authorizationapi.Kind("Identity"):             &IdentityDescriber{c},

 		imageapi.Kind("Image"):                        &ImageDescriber{c},

@@ -171,7 +171,8 @@ func describeBuildDuration(build *buildapi.Build) string {

 // BuildConfigDescriber generates information about a buildConfig

 type BuildConfigDescriber struct {

 	client.Interface

-	host string

+	kubeClient kclient.Interface

+	host       string

 }

 func nameAndNamespace(ns, name string) string {

@@ -439,23 +440,31 @@ func (d *BuildConfigDescriber) Describe(namespace, name string, settings kctl.De

 		describeCommonSpec(buildConfig.Spec.CommonSpec, out)

 		formatString(out, "\nBuild Run Policy", string(buildConfig.Spec.RunPolicy))

 		d.DescribeTriggers(buildConfig, out)

-		if len(buildList.Items) == 0 {

-			return nil

+

+		if len(buildList.Items) > 0 {

+			fmt.Fprintf(out, "\nBuild\tStatus\tDuration\tCreation Time\n")

+

+			builds := buildList.Items

+			sort.Sort(sort.Reverse(buildapi.BuildSliceByCreationTimestamp(builds)))

+

+			for i, build := range builds {

+				fmt.Fprintf(out, "%s \t%s \t%v \t%v\n",

+					build.Name,

+					strings.ToLower(string(build.Status.Phase)),

+					describeBuildDuration(&build),

+					build.CreationTimestamp.Rfc3339Copy().Time)

+				// only print the 10 most recent builds.

+				if i == 9 {

+					break

+				}

+			}

 		}

-		fmt.Fprintf(out, "\nBuild\tStatus\tDuration\tCreation Time\n")

-

-		builds := buildList.Items

-		sort.Sort(sort.Reverse(buildapi.BuildSliceByCreationTimestamp(builds)))

-

-		for i, build := range builds {

-			fmt.Fprintf(out, "%s \t%s \t%v \t%v\n",

-				build.Name,

-				strings.ToLower(string(build.Status.Phase)),

-				describeBuildDuration(&build),

-				build.CreationTimestamp.Rfc3339Copy().Time)

-			// only print the 10 most recent builds.

-			if i == 9 {

-				break

+

+		if settings.ShowEvents {

+			events, _ := d.kubeClient.Events(namespace).Search(buildConfig)

+			if events != nil {

+				fmt.Fprint(out, "\n")

+				kctl.DescribeEvents(events, out)

 			}

 		}

 		return nil

@@ -124,7 +124,7 @@ func TestDescribers(t *testing.T) {

 		name string

 	}{

 		{&BuildDescriber{c, fakeKube}, "bar"},

-		{&BuildConfigDescriber{c, ""}, "bar"},

+		{&BuildConfigDescriber{c, fakeKube, ""}, "bar"},

 		{&ImageDescriber{c}, "bar"},

 		{&ImageStreamDescriber{c}, "bar"},

 		{&ImageStreamTagDescriber{c}, "bar:latest"},