Re #1310 Fixing a null pointer exception.