Make file handling more bullet proof.