[#PRX-233 fixed possible deletion exception