Handling file not founds more gracefully - still some work to do here