Fix NPE in 087dfb010c - oops