Re #922 Preventing a null pointer exception.