Fix crash with null image
Merge branch 'master' into projectmanager