Bug fix - random null dereference