EA-57660 Fixed NPE