Fixed NPE, EA-54714