diff --git a/lustre/tests/munlink.c b/lustre/tests/munlink.c
index 0f424348635c9ad387419d8717ec186967035aa0..62c2765e448e3d4df2cfacc6b2601ffd9200693a 100755
--- a/lustre/tests/munlink.c
+++ b/lustre/tests/munlink.c
@@ -13,16 +13,23 @@ int main(int argc, char ** argv)
 {
         int rc, i;
 
-        if (argc < 2) { 
-                printf("Usage %s filename\n", argv[0]);
+        if (argc < 2) {
+                printf("Usage %s filename {filename ...}\n", argv[0]);
                 return 1;
         }
 
         for (i = 1; i < argc; i++) {
-        	rc = unlink(argv[i]);
-        	if (rc)
-                	printf("unlink(%s) error: %s\n", argv[i],
-                               strerror(errno));
+                rc = unlink(argv[i]);
+                if (rc) {
+                        printf("unlink(%s): %s ", argv[i], strerror(errno));
+                        rc = access(argv[i], F_OK);
+                        if (rc && errno == ENOENT)
+                                printf("(unlinked anyways)\n");
+                        else if (rc == 0)
+                                printf("(still exists)\n");
+                        else
+                                printf("(%s looking up)\n", strerror(errno));
+                }
         }
         return rc;
-} 
+}