Fixed IndexError woes.