Fixing bug with latest WP nightly build where null term IDs are returning the first term

Specifically addresses an issue on VIP