diff --git a/js/ui/runDialog.js b/js/ui/runDialog.js
index bc9689d4d..cf835972e 100644
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@@ -42,7 +42,7 @@ class RunDialog extends ModalDialog.ModalDialog {
             // Developer brain backwards compatibility
             'restart': this._restart.bind(this),
 
-            'debugexit': () => Meta.quit(Meta.ExitCode.ERROR),
+            'debugexit': () => global.context.terminate(),
 
             // rt is short for "reload theme"
             'rt': () => {
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index a1b32aa6b..59c13d8b5 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -324,8 +324,10 @@ var ScreenShield = class {
     showDialog() {
         if (!this._becomeModal()) {
             // In the login screen, this is a hard error. Fail-whale
-            log('Could not acquire modal grab for the login screen. Aborting login process.');
-            Meta.quit(Meta.ExitCode.ERROR);
+            const error = new GLib.Error(
+                Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED,
+                'Could not acquire modal grab for the login screen. Aborting login process.');
+            global.context.terminate_with_error(error);
         }
 
         this.actor.show();