Re #1671 Minor bug, causing an NPE