NULL check

Just to be safe
coherence for font

Also add NULL check to be safe
Update