diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 5793786c6f..fb81def768 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -863,18 +863,13 @@ void Paragraph::Private::latexSpecialChar(
 {
 	char_type const c = text_[i];
 
-	if (style.pass_thru) {
-		if (c != '\0')
-			// FIXME UNICODE: This can fail if c cannot
-			// be encoded in the current encoding.
+	if (style.pass_thru || runparams.verbatim) {
+		if (c != '\0') {
+			Encoding const * const enc = runparams.encoding;
+			if (enc && enc->latexChar(c, true).empty())
+				throw EncodingException(c);
 			os.put(c);
-		return;
-	}
-
-	if (runparams.verbatim) {
-		// FIXME UNICODE: This can fail if c cannot
-		// be encoded in the current encoding.
-		os.put(c);
+		}
 		return;
 	}
 
diff --git a/status.16x b/status.16x
index c30986741a..26946ea78f 100644
--- a/status.16x
+++ b/status.16x
@@ -52,6 +52,8 @@ What's new
 - Protect the math commands \overset and \underset in fragile context
   (bug 7252).
 
+- When exporting, alert about uncodable characters in ERT insets (bug 7310).
+
 
 * USER INTERFACE