More consistent use of the BAD_PTR