Actually fix transitioning to null

Test Plan: grunt fasttest