Merge "Improve ImageManager error message"