Re #945 Preventing null pinted exception.