Avoid NullPointerException discovered while debugging issue #90