Merge branch 'rj/launch-editor-error-message'