Re #1400 Fixing a null pointer exception.