Better error handling & fallback for already existing files