Fix an NPE (thanks, Maxi)