added currentItem to exception handling