Fix a null-pointer