Re #431 Fixing a null pointer exception problem.