Unrelated bugfix for NPE.