A little code clean-up, checking exceptions on rm()