Merge pull request #34 from pysailor/master

In the catalog patch, guard against None values for old_path