Mainly cleanup, but another bug appeared

Suddenly, if the image is unsupported, the fields say 270x240. I thought
I fixed that already...