Proper error handling at edit action