some robustness changes

Items from examining zenphoto.org log