Improved text drawing.
Merge branch 'master' into starbranch
Catching nullpointer exception in draw().