Modify currentIndex on navigator to return null when no current index (rather then -1) to help catch errors earlier.