Merge "Simplify and clean up FileBackend exceptions"