fix exception when options.image_path == NULL
Merge branch 'master' into HEAD