Updated section to return none if no images set