diff --git a/src/filters/rclpst.py b/src/filters/rclpst.py
index 3b3178b7..15e8ea46 100755
--- a/src/filters/rclpst.py
+++ b/src/filters/rclpst.py
@@ -318,6 +318,7 @@ class PstExtractor(object):
             reader = PFFReader(self.em.rclog, infile=self.filein)
             self.generator = reader.mainloop()
 
+        ipath = ""
         try:
             doc, ipath = next(self.generator)
             self.em.setmimetype("message/rfc822")
@@ -325,7 +326,10 @@ class PstExtractor(object):
         except StopIteration:
             self.em.rclog("getnext: end of iteration")
             return(True, "", "", rclexecm.RclExecM.eofnext)
-
+        except Exception as ex:
+            self.em.rclog("getnext: exception: %s" % ex)
+            return(False, "", "", rclexecm.RclExecM.eofnow)
+            
         return (True, doc, ipath, rclexecm.RclExecM.noteof)
     
 
diff --git a/src/index/fsindexer.cpp b/src/index/fsindexer.cpp
index 6509d68f..9e7aa099 100644
--- a/src/index/fsindexer.cpp
+++ b/src/index/fsindexer.cpp
@@ -745,8 +745,8 @@ FsIndexer::processonefile(RclConfig *config,
 		}
 	    } else {
 		hadNonNullIpath = true;
-		make_udi(fn, doc.ipath, udi);
 	    }
+            make_udi(fn, doc.ipath, udi);
 
 	    // Set file name, mod time and url if not done by
             // filter. We used to set the top-level container file