Re #1434 Fixing null pointer exception.