fixing non-destructive NPE

While debugging other issues, this NPE is thrown in background often.  Might as well get it fixed, I don't have a Jira for this.