Added a few more catches, fixed a bug with newlines in names that PL
noticed.