Merge "Fix error checking in MemoryFile."