Actually fix transitioning to null

Test Plan: grunt fasttest
Merge pull request #1460 from spicyj/tg2

Actually fix transitioning to null