NPE fix, readme improved