Fix error on null feature after a delete one

Fix #638
Fix #610