Fix a null pointer issue
Oregon