Yep, you'll still need to check if `$entry_id` is null first.