Only try to remove files which exist
Merge pull request #420 from ros/fix_OSError_builder

Only try to remove files which exist