Add more checks if file exists