Fix null-pointer dereference