Fix NULL image handling, more signal/slot cleanup