extract error handler to separate method to avoid duplication
update API for remove.