Whitelisting implemented properly.

The retrieval of the logo is done after checking the image property. If false, the image obj is not created