Fixed a potential crash. and added icon for images that no longer available.