Fix NPE & add some clarification