Issue 521, avoid an NPE