Fix: A potential null_pointer_deference bug