Fixed NPE .