issue #27 - fixed NPE