Handle kit errors better.