Index: trunk/src/sh_cat.c
===================================================================
--- trunk/src/sh_cat.c	(revision 355)
+++ trunk/src/sh_cat.c	(revision 356)
@@ -40,5 +40,5 @@
   { MSG_FI_CSUM,     SH_ERR_ALL,     FIL,   N_("msg=\"Checksum\" chk=\"%s\" path=\"%s\"")},
   { MSG_FI_DSUM,     SH_ERR_INFO,    FIL,   N_("msg=\"d: %3ld, -: %3ld, l: %3ld, |: %3ld, s: %3ld, c: %3ld, b: %3ld\"")},
-  { MSG_FI_CHK,      SH_ERR_INFO,    FIL,   N_("msg=\"Checking\" path=\"%s\"")},
+  { MSG_FI_CHK,      SH_ERR_INFO,    FIL,   N_("msg=\"Checking %16s\" path=\"%s\"")},
 #endif
 
@@ -181,5 +181,5 @@
   { MSG_FI_CSUM,     SH_ERR_ALL,     FIL,   N_("msg=\"Checksum\" chk=\"%s\" path=\"%s\"")},
   { MSG_FI_DSUM,     SH_ERR_INFO,    FIL,   N_("msg=\"d: %3ld, -: %3ld, l: %3ld, |: %3ld, s: %3ld, c: %3ld, b: %3ld\"")},
-  { MSG_FI_CHK,      SH_ERR_INFO,    FIL,   N_("msg=\"Checking\" path=\"%s\"")},
+  { MSG_FI_CHK,      SH_ERR_INFO,    FIL,   N_("msg=\"Checking %16s\" path=\"%s\"")},
 #endif
 
@@ -382,5 +382,5 @@
   { MSG_FI_CSUM,     SH_ERR_ALL,     FIL,   N_("msg=<Checksum>, chk=<%s>, path=<%s>")},
   { MSG_FI_DSUM,     SH_ERR_INFO,    FIL,   N_("msg=<d: %3ld, -: %3ld, l: %3ld, |: %3ld, s: %3ld, c: %3ld, b: %3ld>")},
-  { MSG_FI_CHK,      SH_ERR_INFO,    FIL,   N_("msg=<Checking>, path=<%s>")},
+  { MSG_FI_CHK,      SH_ERR_INFO,    FIL,   N_("msg=<Checking %16s>, path=<%s>")},
 #endif
 
@@ -522,5 +522,5 @@
   { MSG_FI_CSUM,     SH_ERR_ALL,     FIL,   N_("msg=<Checksum>, chk=<%s>, path=<%s>")},
   { MSG_FI_DSUM,     SH_ERR_INFO,    FIL,   N_("msg=<d: %3ld, -: %3ld, l: %3ld, |: %3ld, s: %3ld, c: %3ld, b: %3ld>")},
-  { MSG_FI_CHK,      SH_ERR_INFO,    FIL,   N_("msg=<Checking>, path=<%s>")},
+  { MSG_FI_CHK,      SH_ERR_INFO,    FIL,   N_("msg=<Checking %16s>, path=<%s>")},
 #endif
 
Index: trunk/src/sh_files.c
===================================================================
--- trunk/src/sh_files.c	(revision 355)
+++ trunk/src/sh_files.c	(revision 356)
@@ -351,8 +351,10 @@
 	  if (flag_err_info == SL_TRUE)
 	    {
+	      char pstr[32];
 #if !defined(WITH_TPT)
 	      tmp = sh_util_safe_name (ptr->name);
 #endif
-	      sh_error_handle ((-1),  FIL__, __LINE__, 0, MSG_FI_CHK, tmp);
+	      sl_strlcpy(pstr, sh_hash_getpolicy(ptr->class), sizeof(pstr));
+	      sh_error_handle ((-1),  FIL__, __LINE__, 0, MSG_FI_CHK, pstr, tmp);
 	    }
 
@@ -1808,5 +1810,8 @@
   if (flag_err_info == SL_TRUE)
     {
-      sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_FI_CHK, tmpname);
+      char pstr[32];
+
+      sl_strlcpy(pstr, sh_hash_getpolicy(iclass), sizeof(pstr));
+      sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_FI_CHK, pstr, tmpname);
     }
 
Index: trunk/src/sh_hash.c
===================================================================
--- trunk/src/sh_hash.c	(revision 355)
+++ trunk/src/sh_hash.c	(revision 356)
@@ -307,4 +307,10 @@
   };
 
+const char * sh_hash_getpolicy(int class)
+{
+  if (class > 0 && class < SH_ERR_T_DIR)
+    return _(policy[class]);
+  return _("[indef]");
+}
 
 /**********************************