[[ Bug 13097 ]] Image filename is never nil; check for emptiness instead