Fixed NPE, updated version [1.3.2]