exception handlig fix for editing