Skip the logic that causes a Nil error if the indexes are nil
Merge remote-tracking branch 'origin/master'