diff --git a/cmd/dlv/cmds/commands.go b/cmd/dlv/cmds/commands.go
index 6813de0b..39c0b3ea 100644
--- a/cmd/dlv/cmds/commands.go
+++ b/cmd/dlv/cmds/commands.go
@@ -732,7 +732,9 @@ func traceCmd(cmd *cobra.Command, args []string) {
 		err = cmds.Call("continue", t)
 		if err != nil {
 			fmt.Fprintln(os.Stderr, err)
-			return 1
+			if !strings.Contains(err.Error(), "exited") {
+				return 1
+			}
 		}
 		return 0
 	}()
diff --git a/cmd/dlv/dlv_test.go b/cmd/dlv/dlv_test.go
index 48b59228..5b01a51b 100644
--- a/cmd/dlv/dlv_test.go
+++ b/cmd/dlv/dlv_test.go
@@ -1038,7 +1038,7 @@ func TestTrace2(t *testing.T) {
 	if !bytes.Contains(output, expected) {
 		t.Fatalf("expected:\n%s\ngot:\n%s", string(expected), string(output))
 	}
-	cmd.Wait()
+	assertNoError(cmd.Wait(), t, "cmd.Wait()")
 }
 
 func TestTraceMultipleGoroutines(t *testing.T) {