diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0321ba3..62c22da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Latest
 
+- [Improvement] Error and interrupt handling in UI and web UI
 - [Bugfix] Fix missing webui env directory
 
 ## 3.1.0 (2019-03-09)
diff --git a/tutor/ui.py b/tutor/ui.py
index 6a3c682..d56708b 100644
--- a/tutor/ui.py
+++ b/tutor/ui.py
@@ -9,5 +9,10 @@ def ui():
     click.echo("""Welcome to the Tutor interactive shell UI!
 Type "help" to view all available commands.
 Type "local quickstart" to configure and launch a new platform from scratch.
-""")
-    click_repl.repl(click.get_current_context())
+Type <ctrl-d> to exit.""")
+    while True:
+        try:
+            click_repl.repl(click.get_current_context())
+            return  # this happens on a ctrl+d
+        except Exception:
+            pass