diff --git a/probe/main.go b/probe/main.go
index f2bf1ffc2..dacc1db43 100644
--- a/probe/main.go
+++ b/probe/main.go
@@ -53,7 +53,7 @@ func main() {
 			log.Printf("exposing Prometheus endpoint at %s%s", *httpListen, *prometheusEndpoint)
 			http.Handle(*prometheusEndpoint, makePrometheusHandler())
 		}
-		go http.ListenAndServe(*httpListen, nil)
+		go func(err error) { log.Print(err) }(http.ListenAndServe(*httpListen, nil))
 	}
 
 	if *spyProcs && os.Getegid() != 0 {
diff --git a/probe/process_mapper_test.go b/probe/process_mapper_test.go
index 61f969428..99421a9fc 100644
--- a/probe/process_mapper_test.go
+++ b/probe/process_mapper_test.go
@@ -17,7 +17,7 @@ func TestCgroupMapper(t *testing.T) {
 		"/netscape/notify_on_release": "0\n",
 		"/weirdfile":                  "",
 	})
-	defer os.RemoveAll(tmp)
+	defer removeAll(t, tmp)
 
 	m := newCgroupMapper(tmp, 1*time.Second)
 	for pid, want := range map[uint]string{
@@ -44,14 +44,20 @@ func setupTmpFS(t *testing.T, fs map[string]string) string {
 	for file, content := range fs {
 		dir := path.Dir(file)
 		if err := os.MkdirAll(filepath.Join(tmp, dir), 0777); err != nil {
-			os.RemoveAll(tmp)
+			removeAll(t, tmp)
 			t.Fatalf("MkdirAll: %v", err)
 		}
 
 		if err := ioutil.WriteFile(filepath.Join(tmp, file), []byte(content), 0655); err != nil {
-			os.RemoveAll(tmp)
+			removeAll(t, tmp)
 			t.Fatalf("WriteFile: %v", err)
 		}
 	}
 	return tmp
 }
+
+func removeAll(t *testing.T, path string) {
+	if err := os.RemoveAll(path); err != nil {
+		t.Error(err)
+	}
+}