Added minor guards to Fileparser