--- wallpapoz-0.4.1-svn92_trunk/src/wallpapoz.nonutf8	2010-06-13 01:21:08.000000000 +0900
+++ wallpapoz-0.4.1-svn92_trunk/src/wallpapoz	2010-06-13 01:39:08.000000000 +0900
@@ -543,6 +543,9 @@
 	num_of_child = self.store.iter_n_children(iter)
 	# what is the directory?
 	cur_dir = filechooser_widget.get_filename()
+	# get_filename can return NoneType (for non-UTF8 directory)
+	if not cur_dir:
+	  return
         # if recursive, we use walktree
 	if recursive_widget.get_active():
 	  # looping with walktree method
@@ -587,6 +590,9 @@
 	new_index = self.store.get_value(next_iter, 0) + 1
 	# what is the directory?
 	cur_dir = filechooser_widget.get_filename()
+	# get_filename can return NoneType (for non-UTF8 directory)
+	if not cur_dir:
+	  return
         # if recursive, we use walktree
 	if recursive_widget.get_active():
 	  # looping with walktree method