Updates for clean handling of exceptions in factories

Not only are the explicitly thrown exceptions a possible issue, but we have to really enclose the whole main block before the finally to delete the file tree.