BACKLOG-940: Fixed NPE