Fix possible null ptr dereference