diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index 5d3aecae6a..1b1102ea01 100644
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -251,11 +251,15 @@ bool LyXTextClass::Read(string const & filename, bool merge)
 
 		case TC_INPUT: // Include file
 			if (lexrc.next()) {
-				string tmp = LibFileSearch("layouts",
-							    lexrc.getString(),
+				string const inc = lexrc.getString();
+				string tmp = LibFileSearch("layouts", inc,
 							    "layout");
 
-				if (Read(tmp, true)) {
+				if (tmp.empty()) {
+					lexrc.printError("Could not find input"
+					                 "file: " + inc);
+					error = true;
+				} else if (Read(tmp, true)) {
 					lexrc.printError("Error reading input"
 							 "file: "+tmp);
 					error = true;
diff --git a/status.14x b/status.14x
index d88d2ff636..3b05432554 100644
--- a/status.14x
+++ b/status.14x
@@ -46,6 +46,8 @@ What's new
 
 - Fix cursor positioning when opening the VSpace dialog (bug 2869).
 
+- Give a better error message for missing layout include files
+
 * Build/installation: