Merge "Fix error handling in File::createThumb."