catch nil images
bump for knife-hp 0.3.1
KNIFE-309 merge
minor cleanups