Don't delete class at index [false] if we don't find a matching class.

Change-Id: Ib9d4b697c73bec1591d8ef61b7c98c45bd3e77c7