Attempt to fix null ptr