fix for #645 - ItemNotFoundException

Please review my fix for #645