NPE issue resolved.