Unplug whitelist

Creating for code review.
Why not just return the first non-null value?