diff --git a/smoketests/stacktrace5/R.out.save b/smoketests/stacktrace5/R.out.save
new file mode 100644
index 000000000..c2a8ca9e9
--- /dev/null
+++ b/smoketests/stacktrace5/R.out.save
@@ -0,0 +1,11 @@
+Loading required package: shiny
+Loading required package: methods
+
+Listening on http://127.0.0.1:8765
+Warning: Error in badservercall: server boom
+Stack trace (innermost first):
+    41: badservercall [${PWD}/stacktrace5/server.R#4]
+    40: server [${PWD}/stacktrace5/server.R#9]
+     1: shiny::runApp [${SHINY}/R/server.R#685]
+Error in badservercall() : server boom
+NULL
diff --git a/smoketests/stacktrace5/server.R b/smoketests/stacktrace5/server.R
new file mode 100644
index 000000000..a89dd2e9e
--- /dev/null
+++ b/smoketests/stacktrace5/server.R
@@ -0,0 +1,10 @@
+library(shiny)
+
+badservercall <- function() {
+  stop("server boom")
+}
+
+function(input, output, session) {
+  on.exit(stopApp())
+  badservercall()
+}
diff --git a/smoketests/stacktrace5/ui.R b/smoketests/stacktrace5/ui.R
new file mode 100644
index 000000000..cc2cc1321
--- /dev/null
+++ b/smoketests/stacktrace5/ui.R
@@ -0,0 +1,4 @@
+library(shiny)
+
+ui <- fluidPage(
+)
diff --git a/smoketests/stacktrace6/R.out.save b/smoketests/stacktrace6/R.out.save
new file mode 100644
index 000000000..8f788f149
--- /dev/null
+++ b/smoketests/stacktrace6/R.out.save
@@ -0,0 +1,21 @@
+Loading required package: shiny
+Loading required package: methods
+
+Listening on http://127.0.0.1:8765
+Warning: Error in baduicall: ui boom
+Stack trace (innermost first):
+    51: baduicall [${PWD}/stacktrace6/ui.R#5]
+    50: tag
+    49: tags$div
+    48: div
+    47: wellPanel [${SHINY}/R/bootstrap.R#320]
+    46: tag
+    45: tags$div
+    44: div
+    43: tagList
+    42: attachDependencies
+    41: bootstrapPage [${SHINY}/R/bootstrap.R#56]
+    40: fluidPage [${SHINY}/R/bootstrap-layout.R#72]
+     1: shiny::runApp [${SHINY}/R/server.R#685]
+Error in baduicall() : ui boom
+NULL
diff --git a/smoketests/stacktrace6/server.R b/smoketests/stacktrace6/server.R
new file mode 100644
index 000000000..a6cdf2441
--- /dev/null
+++ b/smoketests/stacktrace6/server.R
@@ -0,0 +1,4 @@
+library(shiny)
+
+function(input, output, session) {
+}
diff --git a/smoketests/stacktrace6/ui.R b/smoketests/stacktrace6/ui.R
new file mode 100644
index 000000000..81e110705
--- /dev/null
+++ b/smoketests/stacktrace6/ui.R
@@ -0,0 +1,10 @@
+library(shiny)
+
+baduicall <- function() {
+  stopApp()
+  stop("ui boom")
+}
+
+ui <- fluidPage(
+  wellPanel(baduicall())
+)