diff --git a/example/udf2.c b/example/udf2.c
index 9b594ceb..b41f98f7 100644
--- a/example/udf2.c
+++ b/example/udf2.c
@@ -1,5 +1,5 @@
 /*
-  $Id: udf2.c,v 1.4 2006/04/11 01:02:18 rocky Exp $
+  $Id: udf2.c,v 1.5 2006/04/11 06:46:29 rocky Exp $
 
   Copyright (C) 2005, 2006 Rocky Bernstein <rockyb@users.sourceforge.net>
   
@@ -106,6 +106,12 @@ main(int argc, const char *argv[])
     }
     
     p_udf_file = udf_fopen(p_udf_root, psz_udf_fname);
+    if (!p_udf_file) {
+      fprintf(stderr, "Sorry, couldn't find %s in %s\n", 
+	      psz_udf_fname, psz_udf_image);
+      return 2;
+      
+    }
     print_file_info(p_udf_file, udf_get_filename(p_udf_file));
     {
       long unsigned int i_file_length = udf_get_file_length(p_udf_file);
diff --git a/lib/udf/udf_fs.c b/lib/udf/udf_fs.c
index a810b36d..f32f7862 100644
--- a/lib/udf/udf_fs.c
+++ b/lib/udf/udf_fs.c
@@ -1,5 +1,5 @@
 /*
-    $Id: udf_fs.c,v 1.17 2006/04/11 05:47:58 rocky Exp $
+    $Id: udf_fs.c,v 1.18 2006/04/11 06:46:29 rocky Exp $
 
     Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
 
@@ -209,8 +209,8 @@ udf_ff_traverse(udf_dirent_t *p_udf_dirent, char *psz_token)
 	if (p_udf_dirent2) {
 	  udf_dirent_t * p_udf_dirent3 = 
 	    udf_ff_traverse(p_udf_dirent2, next_tok);
-	  
-	  if (!p_udf_dirent3) udf_dirent_free(p_udf_dirent2);
+
+	  /* if p_udf_dirent3 is null p_udf_dirent2 is free'd. */
 	  return p_udf_dirent3;
 	}
       }