Added in check for Null state.
TODO: Add that check into the update hook.