Re #1556 Preventing null pointer exception.