Better error message for bad image
Merge branch 'master' into final