Fixes 331 - better checking of image urls when preloading