diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go
index 3368087270b..e6e9f183bed 100644
--- a/cmd/integration/integration.go
+++ b/cmd/integration/integration.go
@@ -173,7 +173,7 @@ func main() {
 	if len(createdPods) != 7 {
 		glog.Fatalf("Unexpected list of created pods:\n\n%#v\n\n%#v\n\n%#v\n\n", createdPods.List(), fakeDocker1.Created, fakeDocker2.Created)
 	}
-	glog.Infof("OK")
+	glog.Infof("OK - found created pods: %#v", createdPods.List())
 }
 
 // Serve a file for kubelet to read.
diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index a668d8f8083..f33585183f1 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -801,7 +801,12 @@ func (kl *Kubelet) GetPodInfo(podID string) (api.PodInfo, error) {
 		if err != nil {
 			return nil, err
 		}
-		info[containerName] = *inspectResult
+		if inspectResult == nil {
+			// Why did we not get an error?
+			info[containerName] = docker.Container{}
+		} else {
+			info[containerName] = *inspectResult
+		}
 	}
 	return info, nil
 }
diff --git a/pkg/kubelet/kubelet_server.go b/pkg/kubelet/kubelet_server.go
index b2ab0b8a362..0883dc61454 100644
--- a/pkg/kubelet/kubelet_server.go
+++ b/pkg/kubelet/kubelet_server.go
@@ -24,6 +24,7 @@ import (
 	"net/url"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver"
 	"gopkg.in/v1/yaml"
 )
 
@@ -45,6 +46,10 @@ func (s *KubeletServer) error(w http.ResponseWriter, err error) {
 }
 
 func (s *KubeletServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	logger := apiserver.MakeLogged(req, w)
+	w = logger
+	defer logger.Log()
+
 	u, err := url.ParseRequestURI(req.RequestURI)
 	if err != nil {
 		s.error(w, err)