Yes, I should add the same check for the single addToWorkingSet() even though we currently don't have any code path that tries to add a single image file.