Remove if check, because free can be called on NULL
Correct variable name
Merge branch 'image-compare-changes' into as24-master