diff --git a/lldb/test/Shell/Commands/Inputs/command-disassemble-process.lldbinit b/lldb/test/Shell/Commands/Inputs/command-disassemble-process.lldbinit
index 71f3906c3e6cf..06f2bc2fec6c6 100644
--- a/lldb/test/Shell/Commands/Inputs/command-disassemble-process.lldbinit
+++ b/lldb/test/Shell/Commands/Inputs/command-disassemble-process.lldbinit
@@ -3,6 +3,5 @@ disassemble --line
 disassemble --frame
 disassemble --pc
 disassemble --address 0x4004
-disassemble --address 0xdead
 disassemble --count 7
 disassemble --pc --count 7
diff --git a/lldb/test/Shell/Commands/command-disassemble-process.yaml b/lldb/test/Shell/Commands/command-disassemble-process.yaml
index f08792f867c00..1e19fc46f6c4e 100644
--- a/lldb/test/Shell/Commands/command-disassemble-process.yaml
+++ b/lldb/test/Shell/Commands/command-disassemble-process.yaml
@@ -13,6 +13,11 @@
 # RUN:   -o "settings set stop-disassembly-max-size 8000" \
 # RUN:   -o disassemble -o exit 2>&1 | FileCheck %s --check-prefix=BIG
 
+# RUN: %lldb -c %t %T/command-disassemble-process.exe \
+# RUN:   -o "settings set interpreter.stop-command-source-on-error false" \
+# RUN:   -o "disassemble --address 0xdead" -o exit 2>&1 \
+# RUN:   | FileCheck %s --check-prefix=INVALID
+
 # CHECK:       (lldb) disassemble
 # CHECK-NEXT: command-disassemble-process.exe`main:
 # CHECK-NEXT:     0x4002 <+0>: addb   %al, (%rcx)
@@ -43,8 +48,6 @@
 # CHECK-NEXT: ->  0x4004 <+2>: addb   %al, (%rdx)
 # CHECK-NEXT:     0x4006 <+4>: addb   %al, (%rbx)
 # CHECK-NEXT:     0x4008 <+6>: addb   %al, (%rsi)
-# CHECK-NEXT: (lldb) disassemble --address 0xdead
-# CHECK-NEXT: error: Could not find function bounds for address 0xdead
 # CHECK-NEXT: (lldb) disassemble --count 7
 # CHECK-NEXT: command-disassemble-process.exe`main:
 # CHECK-NEXT:     0x4002 <+0>: addb   %al, (%rcx)
@@ -64,6 +67,9 @@
 # CHECK-NEXT:     0x400e:      addb   %cl, (%rcx)
 # CHECK-NEXT:     0x4010:      addb   %cl, (%rdx)
 
+# INVALID: (lldb) disassemble --address 0xdead
+# INVALID: error: Could not find function bounds for address 0xdead
+
 # BIG: error: Not disassembling the current function because it is very large [0x0000000000004002-0x0000000000005f42). To disassemble specify an instruction count limit, start/stop addresses or use the --force option.
 
 --- !ELF