NPE reported, fixes #92.