diff --git a/src/err.h b/src/err.h
index e8663054..b96584d5 100644
--- a/src/err.h
+++ b/src/err.h
@@ -190,7 +190,7 @@ EXTERN char *ErrMsg[]
     "Too many partial OMITs",
     "Too many full OMITs",
     "Warning: PUSH-OMIT-CONTEXT without matching POP-OMIT-CONTEXT",
-    "Error reading file",
+    "Error reading",
     "Expecting end-of-line",
     "Invalid Hebrew date",
     "IIF needs odd number of arguments",
@@ -232,7 +232,7 @@ EXTERN char *ErrMsg[]
     "Expecting number",
     "Bad function in WARN clause",
     "Can't convert between time zones",
-    "No files matching *.rem found in directory %s"
+    "No files matching *.rem"
 }
 #endif /* MK_GLOBALS */
 ;
diff --git a/src/files.c b/src/files.c
index d264c2e8..197474a4 100644
--- a/src/files.c
+++ b/src/files.c
@@ -599,9 +599,10 @@ int IncludeFile(char const *fname)
 	    if (SetupGlobChain(fname, i) == OK) { /* Glob succeeded */
 		if (!i->chain) { /* Oops... no matching files */
 		    if (!Hush) {
-			Eprint(ErrMsg[E_NO_MATCHING_REMS], fname);
+			Eprint("%s: %s", fname, ErrMsg[E_NO_MATCHING_REMS]);
 		    }
-		    return PopFile();
+		    PopFile();
+		    return E_NO_MATCHING_REMS;
 		}
 		while(i->chain) {
 		    fc = i->chain;
@@ -619,9 +620,10 @@ int IncludeFile(char const *fname)
 		return PopFile();
 	    } else {
 		if (!Hush) {
-		    Eprint(ErrMsg[E_NO_MATCHING_REMS], fname);
+		    Eprint("%s: %s", fname, ErrMsg[E_NO_MATCHING_REMS]);
 		}
 	    }
+	    return E_NO_MATCHING_REMS;
 	}
     }
 #endif
diff --git a/src/langs/finnish.h b/src/langs/finnish.h
index e1776b40..3ad895bf 100644
--- a/src/langs/finnish.h
+++ b/src/langs/finnish.h
@@ -308,7 +308,7 @@ EXTERN char *ErrMsg[] =
     "Numero puuttuu",
     "Virheellinen funktio WARN-lausekkeessa",
     "Can't convert between time zones",
-    "No files matching *.rem found in directory %s"
+    "No files matching *.rem"
 
 #elif IBMEXTENDED
     "Ok",
@@ -411,7 +411,7 @@ EXTERN char *ErrMsg[] =
     "Numero puuttuu"
     "Virheellinen funktio WARN-lausekkeessa",
     "Can't convert between time zones",
-    "No files matching *.rem found in directory %s"
+    "No files matching *.rem"
 #else
     "Ok",
     "Puuttuva ']'",
@@ -513,7 +513,7 @@ EXTERN char *ErrMsg[] =
     "Numero puuttuu",
     "Virheellinen funktio WARN-lausekkeessa",
     "Can't convert between time zones",
-    "No files matching *.rem found in directory %s"
+    "No files matching *.rem"
 
 #endif
 };
diff --git a/src/langs/french.h b/src/langs/french.h
index f10fb2cd..29f9950d 100644
--- a/src/langs/french.h
+++ b/src/langs/french.h
@@ -245,7 +245,7 @@ EXTERN char *ErrMsg[] =
     "Nombre attendu",
     "Fonction ill\351gale apr\350s WARN",
     "Can't convert between time zones",
-    "No files matching *.rem found in directory %s"
+    "No files matching *.rem"
 #else /* ISOLATIN1 */
     "Ok",
     "']' manquant",
@@ -347,7 +347,7 @@ EXTERN char *ErrMsg[] =
     "Nombre attendu",
     "Fonction illegale apres WARN",
     "Can't convert between time zones",
-    "No files matching *.rem found in directory %s"
+    "No files matching *.rem"
 #endif /* ISOLATIN1 */
 };
 #endif /* MK_GLOBALS */
diff --git a/src/langs/polish.h b/src/langs/polish.h
index 256784e4..97295124 100644
--- a/src/langs/polish.h
+++ b/src/langs/polish.h
@@ -280,7 +280,7 @@ EXTERN char *ErrMsg[] =
     "Spodziewana liczba",
     "Illegal function in WARN clause (NEEDS TRANSLATION TO POLISH)",
     "Can't convert between time zones",
-    "No files matching *.rem found in directory %s"
+    "No files matching *.rem"
 #else /* ISOLATIN1 */
     "OK",
     "Brakujacy ']'",
@@ -382,7 +382,7 @@ EXTERN char *ErrMsg[] =
     "Spodziewana liczba",
     "Illegal function in WARN clause (NEEDS TRANSLATION TO POLISH)",
     "Can't convert between time zones",
-    "No files matching *.rem found in directory %s"
+    "No files matching *.rem"
 #endif /* ISOLATIN1 */
 };
 #endif /* MK_GLOBALS */
diff --git a/src/langs/portbr.h b/src/langs/portbr.h
index 1b4c2bc3..a7a82470 100644
--- a/src/langs/portbr.h
+++ b/src/langs/portbr.h
@@ -246,7 +246,7 @@ EXTERN char *ErrMsg[] =
     "Esperando numero",
     "Funcao ilegal na clausula WARN",
     "Can't convert between time zones",
-    "No files matching *.rem found in directory %s"
+    "No files matching *.rem"
 };
 #endif /* MK_GLOBALS */