Handle edit gracefully