Fix handling of optional image properties

I think this is the best way to handle the properties.  This will be release 3.2.