Fixed NPE EA-44106