NPE fixed. Issue #85