EA-49167 Fixed NPE